[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 1134: Installation, split postgres installation and tuning section
revno: 1134 committer: Lars Helge Overland branch nick: dhis2-docbook-docs timestamp: Thu 2014-07-10 09:14:21 +0200 message: Installation, split postgres installation and tuning section modified: src/docbkx/en/dhis2_implementation_guide_installation.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'src/docbkx/en/dhis2_implementation_guide_installation.xml' --- src/docbkx/en/dhis2_implementation_guide_installation.xml 2014-07-01 12:12:11 + +++ src/docbkx/en/dhis2_implementation_guide_installation.xml 2014-07-10 07:14:21 + @@ -86,12 +86,12 @@ instructions. sudo dpkg-reconfigure tzdata It is easy to keep your server very accurate by using the NTP package. NTP will -automatically syncronize your server time on a regular basis. You can install it by simply +automatically syncronize your server time on a regular basis. You can install it by invoking: sudo apt-get install ntp - Postgresql installation and tuning + PostgreSQL installation Install PostgreSQL 9.3 by invoking: sudo apt-get install postgresql-9.3 Switch to the postgres user by invoking: @@ -104,8 +104,13 @@ Return to your session by invoking exit You now have a PostgreSQL user called dhis and a database called dhis2. - Do performance tuning by opening the following file by invoking - sudo nano /etc/postgresql/9.2/main/postgresql.conf + + + PostgreSQL performance tuning + Tuning PostgreSQL is necessary to achieve a high-performing system but is optional in +terms of getting DHIS 2 to run. PostgreSQL is configured and tuned through the +postgresql.conf filel which can be opened like this: + sudo nano /etc/postgresql/9.3/main/postgresql.conf and set the following properties: shared_buffers = 3200MB Determines how much memory should be allocated exclusively for PostgreSQL caching. 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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16065: Minor fix for visit schedule.
revno: 16065
committer: Tran Chau
branch nick: dhis2
timestamp: Thu 2014-07-10 14:17:45 +0700
message:
Minor fix for visit schedule.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2014-06-24 14:23:58 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2014-07-10 07:17:45 +
@@ -108,7 +108,7 @@
$i18n.getString('selected')
$i18n.getString('children_only')
- $i18n.getString('all')
+ $i18n.getString('all')
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2014-07-08 08:27:29 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js 2014-07-10 07:17:45 +
@@ -303,26 +303,22 @@
function exportActitityList( type )
{
-var facilityLB = $('input[name=facilityLB]:checked').val();
-var params = "programId=" + getFieldValue('program');
-
-params += "&type=xls";
-params += "&searchTexts=stat_" + getFieldValue('program')
-+ "_" + getFieldValue('startDueDate')
-+ "_" + getFieldValue('endDueDate');
-
-if( facilityLB == 'selected' ) {
-params += "_" + getFieldValue('orgunitId');
-}
-else if( facilityLB == 'all' ) {
-params += "_0";
-}
-else if( facilityLB == 'childrenOnly' ) {
-params += "_-1";
-}
-
-params += "_false_" + getFieldValue('status');
-window.location.href = "getActivityPlanRecords.action?" + params;
+ var params = "?ou=" + getFieldValue("orgunitId");
+ params += "&program=" + getFieldValue('program');
+ params += "&ouMode=" + $('input[name=ouMode]:checked').val();
+ params += "&programStatus=ACTIVE";
+ params += "&eventStartDate=" + getFieldValue('startDueDate');
+ params += "&eventEndDate=" + getFieldValue('endDueDate');
+
+ if(getFieldValue('status')!=''){
+ params += '&eventStatus=' + getFieldValue('status');
+ }
+
+ $('#attributeIds option').each(function(i, item){
+ params += "&attribute=" + item.value;
+ });
+
+window.location.href = "../api/trackedEntityInstances." + type + params;
}
//
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2014-07-10 06:49:13 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2014-07-10 07:17:45 +
@@ -17,10 +17,7 @@
-
- $i18n.getString( "attributes" ):
-
-$id
+$id
$i18n.getString('program_stage'):
$programStageInstance.programStage.displayName
___
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-documenters/dhis2/dhis2-docbook-docs] Rev 1135: Typo
revno: 1135 committer: Lars Helge Overland branch nick: dhis2-docbook-docs timestamp: Thu 2014-07-10 09:46:51 +0200 message: Typo modified: src/docbkx/en/dhis2_implementation_guide_installation.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'src/docbkx/en/dhis2_implementation_guide_installation.xml' --- src/docbkx/en/dhis2_implementation_guide_installation.xml 2014-07-10 07:14:21 + +++ src/docbkx/en/dhis2_implementation_guide_installation.xml 2014-07-10 07:46:51 + @@ -108,8 +108,8 @@ PostgreSQL performance tuning Tuning PostgreSQL is necessary to achieve a high-performing system but is optional in -terms of getting DHIS 2 to run. PostgreSQL is configured and tuned through the -postgresql.conf filel which can be opened like this: +terms of getting DHIS 2 to run. PostgreSQL is configured and tuned through the postgresql.conf file which can be edited like this: sudo nano /etc/postgresql/9.3/main/postgresql.conf and set the following properties: shared_buffers = 3200MB ___ 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 16066: GIS minor fix.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16066 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 10:49:47 +0200
message:
GIS minor fix.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-07-08 15:27:21 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-07-10 08:48:08 +
@@ -6495,7 +6495,7 @@
});
label = Ext.create('Ext.panel.Panel', {
- title: '' + GIS.i18n.labels + '',
+ title: 'Options',
hideCollapseTool: true,
items: labelPanel,
listeners: {
@@ -7997,7 +7997,7 @@
labelPanel = Ext.create('Ext.ux.panel.LabelPanel');
label = Ext.create('Ext.panel.Panel', {
- title: '' + GIS.i18n.labels + '',
+ title: 'Options',
hideCollapseTool: true,
items: labelPanel,
listeners: {
___
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 1340119] [NEW] DHIS2.16 tracked entity custom form exception
Public bug reported: Hi Devs, I was having trouble loading tracked entity custom form but after deleting and recreating it now works. However, you might want to check on the demo site as I have been able to reproduce this error on the Snapshot Demo site by creating a test custom form for the Child Program. 1) Go to individual records and select Ngelehun CHC 2) Select Child Program and list all instances 3) Click on view profile icon You get an exception. It would be great if you could have a look into this to save someone else the trouble if and when they upgrade to 2.16. Regards, Busoye Version: 2.16-SNAPSHOT Build revision: 16066 ** Affects: dhis2 Importance: Undecided Status: New ** Summary changed: - tracked entity custom form exception + DHIS2.16 tracked entity custom form exception -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1340119 Title: DHIS2.16 tracked entity custom form exception Status in DHIS 2: New Bug description: Hi Devs, I was having trouble loading tracked entity custom form but after deleting and recreating it now works. However, you might want to check on the demo site as I have been able to reproduce this error on the Snapshot Demo site by creating a test custom form for the Child Program. 1) Go to individual records and select Ngelehun CHC 2) Select Child Program and list all instances 3) Click on view profile icon You get an exception. It would be great if you could have a look into this to save someone else the trouble if and when they upgrade to 2.16. Regards, Busoye Version: 2.16-SNAPSHOT Build revision: 16066 To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1340119/+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 16067: Impl support for putting analytics engine/Web API in maintenance mode. This implies that all requ...
revno: 16067
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 12:27:53 +0200
message:
Impl support for putting analytics engine/Web API in maintenance mode. This
implies that all requests should return 503 Service unavailable, and avoid that
the request executes a database query. This is useful when you need to do
maintenance or re-run the analytics tables on a live system without taking down
the entire system / allowing users to do perform other functions like data
entry.
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MaintenanceModeException.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/QueryPlanner.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryPlanner.java
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventQueryPlanner.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AnalyticsController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CrudControllerAdvice.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EventAnalyticsController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MaintenanceModeException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MaintenanceModeException.java 1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MaintenanceModeException.java 2014-07-10 10:27:53 +
@@ -0,0 +1,41 @@
+package org.hisp.dhis.common;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author Lars Helge Overland
+ */
+public class MaintenanceModeException
+extends RuntimeException
+{
+public MaintenanceModeException( String message )
+{
+super( message );
+}
+}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-06-26 14:38:54 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-07-10 10:27:53 +00
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16068: Typoo
revno: 16068
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 12:31:06 +0200
message:
Typoo
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2014-07-10 10:27:53 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2014-07-10 10:31:06 +
@@ -213,7 +213,7 @@
if ( maintenance )
{
-throw new MaintenanceModeException( "Analytics engine is in maintenanec mode, try again later" );
+throw new MaintenanceModeException( "Analytics engine is in maintenance mode, try again later" );
}
}
___
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 16069: Analytics task, more info on exception
revno: 16069
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 13:05:22 +0200
message:
Analytics task, more info on exception
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java 2014-05-04 12:21:18 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java 2014-07-10 11:05:22 +
@@ -37,6 +37,7 @@
import org.hisp.dhis.message.MessageService;
import org.hisp.dhis.scheduling.TaskId;
import org.hisp.dhis.system.notification.Notifier;
+import org.hisp.dhis.system.util.DebugUtils;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -141,11 +142,16 @@
notifier.notify( taskId, INFO, "Analytics tables updated", true );
}
-catch ( RuntimeException ex )
+catch ( Exception ex )
{
notifier.notify( taskId, ERROR, "Process failed: " + ex.getMessage(), true );
-messageService.sendFeedback( "Analytics table process failed", "Analytics table process failed, please check the logs.", null );
+messageService.sendFeedback(
+"Analytics table process failed",
+"Analytics table process failed, please check the logs. " +
+"Message: " + ex.getMessage() + " " +
+"Cause: " + DebugUtils.getStackTrace( ex.getCause() ),
+null );
throw ex;
}
___
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 16070: tracker capture - minor improvments
revno: 16070
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-07-10 15:17:04 +0200
message:
tracker capture - minor improvments
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/teiReport.html
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/tei.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-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2014-07-02 16:25:28 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2014-07-10 13:17:04 +
@@ -33,7 +33,7 @@
if($scope.selectedProgram){
EnrollmentService.getByEntityAndProgram($scope.selectedTei.trackedEntityInstance, $scope.selectedProgram.id).then(function(data){
$scope.enrollments = data.enrollmentList;
-$scope.loadEvents();
+$scope.loadEnrollmentDetails();
});
}
else{
@@ -41,7 +41,7 @@
}
});
-$scope.loadEvents = function() {
+$scope.loadEnrollmentDetails = function() {
if($scope.selectedProgram){
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-07-09 09:33:55 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html 2014-07-10 13:17:04 +
@@ -31,8 +31,7 @@
-
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-07-09 09:33:55 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html 2014-07-10 13:17:04 +
@@ -18,7 +18,7 @@
-
+
{{relationships[rel.relationship].bIsToA}}
{{relationships[rel.relationship].aIsToB}}
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js 2014-07-09 12:49:49 +
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/report/report-controller.js 2014-07-10 13:17:04 +
@@ -56,7 +56,7 @@
angular.forEach(eventList, function(ev){
if(ev.trackedEntityInstance){
ev.name = $scope.programStages[ev.programStage].name;
-ev.programName = $scope.selectedProgram.name
+ev.programName = $scope.selectedProgram.name;
ev.statusColor = EventUtils.getEventStatusColor(ev);
ev.eventDate = DateUtils.format(ev.eventDate);
@@ -99,7 +99,8 @@
modalInstance.result.then({
});
-};
+};
+
})
//Controller for event details
@@ -208,10 +209,6 @@
programId = $scope.selectedProgram.id;
}
-/*if($scope.selectedOrgUnit){
[Dhis2-devs] [Bug 1340119] Re: DHIS2.16 tracked entity custom form exception
** Changed in: dhis2 Assignee: (unassigned) => Thu Tran (tran-hispvietnam) -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1340119 Title: DHIS2.16 tracked entity custom form exception Status in DHIS 2: New Bug description: Hi Devs, I was having trouble loading tracked entity custom form but after deleting and recreating it now works. However, you might want to check on the demo site as I have been able to reproduce this error on the Snapshot Demo site by creating a test custom form for the Child Program. 1) Go to individual records and select Ngelehun CHC 2) Select Child Program and list all instances 3) Click on view profile icon You get an exception. It would be great if you could have a look into this to save someone else the trouble if and when they upgrade to 2.16. Regards, Busoye Version: 2.16-SNAPSHOT Build revision: 16066 To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1340119/+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 16071: Fixed bug - Exception thrown when to open Edit profile form in TEI list.
revno: 16071 committer: Tran Chau branch nick: dhis2 timestamp: Thu 2014-07-10 18:59:42 +0700 message: Fixed bug - Exception thrown when to open Edit profile form in TEI list. modified: dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-07-03 09:17:44 + +++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-07-10 11:59:42 + @@ -276,8 +276,7 @@ executeSql( "UPDATE trackedentityaudit SET accessedmodule='tracked_entity_instance_dashboard' WHERE accessedmodule='instance_dashboard' or accessedmodule='patient_dashboard'" ); -executeSql( "UPDATE program_attributes SET allowDateInFuture='false' WHERE allowDateInFuture is null" ); - + executeSql( "UPDATE programstageinstance SET status=1 WHERE completed=true" ); executeSql( "ALTER TABLE programstageinstance DROP COLUMN completed" ); @@ -291,6 +290,11 @@ executeSql( "update programstage_dataelements set allowfuturedate = allowdateinfuture where allowfuturedate is null" ); executeSql( "update programstage_dataelements set allowfuturedate = false where allowfuturedate is null" ); executeSql( "ALTER TABLE programstage_dataelements DROP COLUMN allowdateinfuture" ); + +executeSql( "update program_attributes set allowfuturedate = allowdateinfuture where allowfuturedate is null" ); +executeSql( "update program_attributes set allowfuturedate = false where allowfuturedate is null" ); +executeSql( "ALTER TABLE program_attributes DROP COLUMN allowdateinfuture" ); +executeSql( "UPDATE program_attributes SET allowFutureDate='false' WHERE allowFutureDate is null" ); } // - ___ 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 16072: AnalyticsTableTask, minor
revno: 16072
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 14:07:18 +0200
message:
AnalyticsTableTask, minor
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java 2014-07-10 11:05:22 +
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java 2014-07-10 12:07:18 +
@@ -142,7 +142,7 @@
notifier.notify( taskId, INFO, "Analytics tables updated", true );
}
-catch ( Exception ex )
+catch ( RuntimeException ex )
{
notifier.notify( taskId, ERROR, "Process failed: " + ex.getMessage(), 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] [Bug 1340119] Re: DHIS2.16 tracked entity custom form exception
** Changed in: dhis2 Status: New => Fix Committed -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1340119 Title: DHIS2.16 tracked entity custom form exception Status in DHIS 2: Fix Committed Bug description: Hi Devs, I was having trouble loading tracked entity custom form but after deleting and recreating it now works. However, you might want to check on the demo site as I have been able to reproduce this error on the Snapshot Demo site by creating a test custom form for the Child Program. 1) Go to individual records and select Ngelehun CHC 2) Select Child Program and list all instances 3) Click on view profile icon You get an exception. It would be great if you could have a look into this to save someone else the trouble if and when they upgrade to 2.16. Regards, Busoye Version: 2.16-SNAPSHOT Build revision: 16066 To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1340119/+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-documenters/dhis2/dhis2-docbook-docs] Rev 1136: Updated docs on import options
revno: 1136 committer: Lars Helge Overland branch nick: dhis2-docbook-docs timestamp: Thu 2014-07-10 14:19:57 +0200 message: Updated docs on import options modified: src/docbkx/en/dhis2_user_man_web_api.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'src/docbkx/en/dhis2_user_man_web_api.xml' --- src/docbkx/en/dhis2_user_man_web_api.xml 2014-07-10 06:55:48 + +++ src/docbkx/en/dhis2_user_man_web_api.xml 2014-07-10 12:19:57 + @@ -733,23 +733,36 @@ dataElementIdScheme id | name | code -Which property on the data element object to reference from the XML attribute +Which property on the data element object to reference from the XML +attribute. orgUnitIdScheme id | name | code -Which property on the org unit object to reference from the XML attribute +Which property on the org unit object to reference from the XML +attribute. dryRun false | true -Whether to save changes on the server or just return the import summary +Whether to save changes on the server or just return the import summary. importStrategy -new_and_updates | new | updates -Save objects of all, new or update import status on the server +NEW_AND_UPDATES | NEW | UPDATES | DELETES +Save objects of all, new or update import status on the server. + + async + false | true + Import data asynchronously and return the request immeditately. + + + skipExistingCheck + false | true + Skip checks for existing data values. Improves performance. Only use for empty +databases or when the data values to import do not exist already. + ___ 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 16073: Logging
revno: 16073
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 14:23:09 +0200
message:
Logging
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-06-30 13:54:03 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-07-10 12:23:09 +
@@ -407,6 +407,7 @@
private ImportSummary saveDataValueSet( ImportOptions importOptions, TaskId id, DataValueSet dataValueSet )
{
+log.debug( "Import options: " + importOptions );
notifier.clear( id ).notify( id, "Process started" );
ImportSummary summary = new ImportSummary();
___
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] Analytics running even without scheduling
Hi all, We have been facing a problem these days where we are trying to run the DHIS2 database locally even though it is working without a problem on our Amazon EC2 server. Whenever tomcat starts, it immediately goes to running analytics and we can not get in to any of the modules since it hangs up on that specific task. It hangs on like that for hours. This happens even if we have stopped the datamart and analytics schedule. I check my JAVA_OPTS and we have -Xmx4000m -Xms2000m -XX:MaxPermSize=500m -XX:PermSize=300m which should be more than enough. I have a 6GB RAM Windows 8.1 machine, with the latest java build. All the best, Seid, 2014-07-10 15:22:20 Commons Daemon procrun stdout initialized * INFO 2014-07-10 15:23:11,104 System property dhis2.home not set (DefaultLocationManager.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:11,108 Environment variable DHIS2_HOME points to C:\Users\seid\dhis2 (DefaultLocationManager.java [localhost-startStop-1]) * WARN 2014-07-10 15:23:12,247 HHH000223: Recognized obsolete hibernate namespace http://hibernate.sourceforge.net/. Use namespace http://www.hibernate.org/dtd/ instead. Refer to Hibernate 3.6 Migration Guide! (DTDEntityResolver.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:14,238 Hibernate configuration loaded, using dialect: org.hibernate.dialect.PostgreSQLDialect (DefaultHibernateConfigurationProvider.java [localhost-startStop-1]) * WARN 2014-07-10 15:23:15,800 HHH000223: Recognized obsolete hibernate namespace http://hibernate.sourceforge.net/. Use namespace http://www.hibernate.org/dtd/ instead. Refer to Hibernate 3.6 Migration Guide! (DTDEntityResolver.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:36,202 Found the following message senders: [org.hisp.dhis.message.EmailMessageSender@2a5967a4, org.hisp.dhis.sms.SmsMessageSender@53a355b4] (DefaultMessageService.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:42,345 Detecting apps: [] (DefaultAppManager.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:42,456 SMSLib: A Java API library for sending and receiving SMS via a GSM modem or other supported gateways. This software is distributed under the terms of the Apache v2.0 License. Web Site: http://smslib.org (Service.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:42,456 Version: 3.5.3 (Service.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:42,457 JRE Version: 1.7.0_55 (Service.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:42,457 JRE Impl Version: 24.55-b03 (Service.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:42,457 O/S: Windows 8 / amd64 / 6.2 (Service.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:46,574 Executing startup routine [1 of 11, runlevel 1]: TableAlteror (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:56,306 Tables updated (TableAlteror.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:56,307 Executing startup routine [2 of 11, runlevel 1]: MapViewUpgrader (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:56,582 Executing startup routine [3 of 11, runlevel 2]: IdentityPopulator (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:57,683 Executing startup routine [4 of 11, runlevel 2]: PeriodTypePopulator (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:57,692 Executing startup routine [5 of 11, runlevel 3]: TableCreator (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:57,720 Executing startup routine [6 of 11, runlevel 3]: DataElementDefaultDimensionPopulator (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:58,003 Linked default category with default concept (DataElementDefaultDimensionPopulator.java [localhost-startStop-1]) * INFO 2014-07-10 15:23:58,496 Executing startup routine [7 of 11, runlevel 4]: PatientTableAlteror (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:24:01,425 Executing startup routine [8 of 11, runlevel 5]: DataEntryFormUpgrader (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:24:01,459 Upgraded custom case entry form identifiers: 21 (DataEntryFormUpgrader.java [localhost-startStop-1]) * INFO 2014-07-10 15:24:01,463 Executing startup routine [9 of 11, runlevel 6]: ExpressionUpgrader (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:24:01,568 Executing startup routine [10 of 11, runlevel 7]: ConfigurationPopulator (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:24:01,577 Executing startup routine [11 of 11, runlevel 7]: I18nLocalePopulator (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:24:01,588 All startup routines done (DefaultStartupRoutineExecutor.java [localhost-startStop-1]) * INFO 2014-07-10 15:
Re: [Dhis2-devs] Analytics running even without scheduling
Hi, that sounds weird. Try deleting the system setting record that controls scheduling and restart server. delete from systemsetting where name='keySchedTasks'; On Thu, Jul 10, 2014 at 2:42 PM, Seid Hussein wrote: > Hi all, > > We have been facing a problem these days where we are trying to run the > DHIS2 database locally even though it is working without a problem on our > Amazon EC2 server. > > Whenever tomcat starts, it immediately goes to running analytics and we > can not get in to any of the modules since it hangs up on that specific > task. It hangs on like that for hours. This happens even if we have stopped > the datamart and analytics schedule. > > I check my JAVA_OPTS and we have > > -Xmx4000m -Xms2000m -XX:MaxPermSize=500m -XX:PermSize=300m > > which should be more than enough. > > I have a 6GB RAM Windows 8.1 machine, with the latest java build. > > > All the best, > > > Seid, > > ___ > 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 16074: Settings, i18n
revno: 16074 committer: Lars Helge Overland branch nick: dhis2 timestamp: Thu 2014-07-10 15:15:32 +0200 message: Settings, i18n modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2014-07-10 10:27:53 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2014-07-10 13:15:32 + @@ -18,18 +18,20 @@ portal=Portal start_page=Start page no_start_page=No start page -intro_system_general_settings=Customize the system behavior with regard to aggregation strategy, infrastructural data elements and more. -intro_system_appearance_settings=Customize the system behavior with regard to application title, style, flag, start page. -intro_system_email_settings=Configure the email SMTP setup with regard to host name, user name and password. -intro_system_approval_settings=Configure the levels at which data is approved according to organisation unit level and category option group. -intro_system_access_settings=Configure access to the system, like which user role should be used for user self registration. -intro_system_calendar_settings=Configure system calendar and date format -system_general_settings=System General Settings -system_appearance_settings=System Appearance Settings -system_email_settings=System Email Settings -system_approval_settings=System Approval Settings -system_calendar_settings=System Calendar Settings -system_access_settings=System Access Settings +intro_general_settings=Customize the system behavior with regard to aggregation strategy, infrastructural data elements and more. +intro_appearance_settings=Customize the system behavior with regard to application title, style, flag, start page. +intro_email_settings=Configure the email SMTP setup with regard to host name, user name and password. +intro_approval_settings=Configure the levels at which data is approved according to organisation unit level and category option group. +intro_access_settings=Configure access to the system, like which user role should be used for user self registration. +intro_data_synchronization = Configure remote server URL and authentication for automatic synchronization of data. +intro_calendar_settings=Configure the system calendar and date format. The system supports a wide range of calendars. +general_settings=General Settings +appearance_settings=Appearance Settings +email_settings=Email Settings +approval_settings=Approval Settings +calendar_settings=Calendar Settings +access_settings=Access Settings +data_synchronization=Data Synchronization general=General appearance=Appearance email=Email @@ -107,11 +109,9 @@ custom_login_page_logo=Custom login page logo custom_top_menu_logo=Custom top menu logo synchronization=Synchronization -data_synchronization=Data synchronization remote_server_url=Remote server URL remote_server_username=Remote server username remote_server_password=Remote server password -intro_data_synchronization = A data synchronization with remote server functionality recommended=recommended put_analytics_in_maintenance_mode=Put analytics in maintenance mode returns=returns === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2014-07-08 00:53:57 + +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml 2014-07-10 13:15:32 + @@ -156,7 +156,7 @@ - + /main.vm /dhis-web-maintenance-settings/systemSynchronizationSettings.vm /dhis-web-maintenance-settings/settingsMenu.vm === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16075: Slight change to long date format
revno: 16075
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 15:50:34 +0200
message:
Slight change to long date format
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2014-05-20 16:56:12 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2014-07-10 13:50:34 +
@@ -212,6 +212,7 @@
return (T) xmlMapper.readValue( input, clazz );
}
+@SuppressWarnings("unchecked")
public static T fromJson( InputStream inputStream, TypeReference typeReference ) throws IOException
{
return (T) jsonMapper.readValue( inputStream, typeReference );
=== 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-06-16 20:10:19 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java 2014-07-10 13:50:34 +
@@ -61,6 +61,10 @@
new SimpleDateFormat( "" )
};
+public static final SimpleDateFormat LONG_DATE_FORMAT = new SimpleDateFormat( "-MM-dd'T'HH:mm:ss" );
+public static final SimpleDateFormat ACCESS_DATE_FORMAT = new SimpleDateFormat( "/MM/dd HH:mm:ss" );
+public static final SimpleDateFormat HTTP_DATE_FORMAT = new SimpleDateFormat( "EEE, dd MMM HH:mm:ss" );
+
public static final double DAYS_IN_YEAR = 365.0;
private static final long MS_PER_DAY = 8640;
@@ -74,9 +78,7 @@
*/
public static String getAccessDateString( Date date )
{
-final SimpleDateFormat format = new SimpleDateFormat( "/MM/dd HH:mm:ss" );
-
-return date != null ? format.format( date ) : null;
+return date != null ? ACCESS_DATE_FORMAT.format( date ) : null;
}
/**
@@ -87,9 +89,7 @@
*/
public static String getLongDateString( Date date )
{
-final SimpleDateFormat format = new SimpleDateFormat( "-MM-dd HH:mm:ss" );
-
-return date != null ? format.format( date ) : null;
+return date != null ? LONG_DATE_FORMAT.format( date ) : null;
}
/**
@@ -148,9 +148,7 @@
*/
public static String getHttpDateString( Date date )
{
-final SimpleDateFormat format = new SimpleDateFormat( "EEE, dd MMM HH:mm:ss" );
-
-return format.format( date ) + " GMT";
+return HTTP_DATE_FORMAT.format( date ) + " GMT";
}
/**
___
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 16076: Including created field in data value set
revno: 16076
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 16:16:24 +0200
message:
Including created field in data value set
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingJsonDataValue.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java 2014-06-30 13:54:03 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java 2014-07-10 14:16:24 +
@@ -155,6 +155,9 @@
this.storedBy = storedBy;
}
+@JsonProperty
+@JsonView( { DetailedView.class, ExportView.class } )
+@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0)
public String getCreated()
{
return created;
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2014-07-07 15:02:50 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2014-07-10 14:16:24 +
@@ -28,7 +28,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.csvreader.CsvWriter;
+import static org.hisp.dhis.system.util.ConversionUtils.getIdentifiers;
+import static org.hisp.dhis.system.util.DateUtils.getMediumDateString;
+import static org.hisp.dhis.system.util.TextUtils.getCommaDelimitedString;
+
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Set;
+
import org.amplecode.staxwax.factory.XMLFactory;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
@@ -36,23 +45,13 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.system.util.DateUtils;
import org.hisp.dhis.system.util.StreamUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.rowset.SqlRowSet;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Set;
-
-import static org.hisp.dhis.system.util.ConversionUtils.getIdentifiers;
-import static org.hisp.dhis.system.util.DateUtils.getMediumDateString;
-import static org.hisp.dhis.system.util.TextUtils.getCommaDelimitedString;
+import com.csvreader.CsvWriter;
/**
* @author Lars Helge Overland
@@ -107,7 +106,6 @@
Set dataElements, Set periods, Set orgUnits, DataValueSet dataValueSet )
{
SqlRowSet rowSet = jdbcTemplate.queryForRowSet( getDataValueSql( dataElements, periods, orgUnits ) );
-DateTimeFormatter fmt = ISODateTimeFormat.dateTime();
dataValueSet.setDataSet( dataSet != null ? dataSet.getUid() : null );
dataValueSet.setCompleteDate( getMediumDateString( completeDate ) );
@@ -128,15 +126,8 @@
dataValue.setCategoryOptionCombo( rowSet.getString( "cocuid" ) );
dataValue.setValue( rowSet.getString( "value" ) );
dataValue.setStoredBy( rowSet.getString( "storedby" ) );
-
-java.sql.Date lastUpdated = rowSet.getDate( "lastupdated" );
-
-if ( lastUpdated != null )
-{
-DateTime dt = new DateTime( lastUpdated );
-dataValue.setLastUpdated( fmt.print( dt ) );
-}
-
+dataValue.setCreated( DateUtils.getLongDateString( rowSet.getDate( "created" ) ) );
+dataValue.setLastUpdated( DateUtils.getLongDateString( rowSet.getDate( "lastupdated" ) ) );
dataValue.setComment( rowSet.getString( "comment" ) );
dataValue.setFollowup( rowSet.getBoolean( "followup" ) );
dataValue.close();
@@ -148,7 +139,7 @@
private String getDataValueSql( Collection dataElements, Collection periods, Collection orgUnits )
{
return
-"select de.uid as deuid, pe.startdate, pt.name, ou.uid
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16077: Impl first cut of function for synchronizing data values from one instance of DHIS to another onl...
revno: 16077
committer: Lars Helge Overland
branch nick: dhis2
timestamp: Thu 2014-07-10 18:06:48 +0200
message:
Impl first cut of function for synchronizing data values from one instance of
DHIS to another online instance of DHIS. Uses streaming POST request for data
value set through spring rest template. Using basic auth. Stores time of last
synch success. Converts the response into an ImportSummary and checks for
status of synch process.
added:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/ImportSummaryResponseExtractor.java
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportConflict.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/SynchronizationManager.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java 2014-06-12 16:30:25 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java 2014-07-10 16:06:48 +
@@ -52,6 +52,8 @@
void writeDataValueSetJson( Set dataSet, Date startDate, Date endDate, Set ous, OutputStream outputStream );
+void writeDataValueSetJson( Date lastUpdated, OutputStream outputStream );
+
void writeDataValueSetCsv( Set dataSets, Date startDate, Date endDate, Set orgUnits, Writer writer );
RootNode getDataValueSetTemplate( DataSet dataSet, Period period, List orgUnits,
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java 2014-03-18 08:10:10 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java 2014-07-10 16:06:48 +
@@ -38,13 +38,18 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
+/**
+ * @author Lars Helge Overland
+ */
public interface DataValueSetStore
{
public void writeDataValueSetXml( DataSet dataSet, Date completeDate, Period period, OrganisationUnit orgUnit,
Set dataElements, Set periods, Set orgUnits, OutputStream out );
-public void writeDataValueSetCsv( Set dataElements,
-Set periods, Set orgUnits, Writer writer );
+public void writeDataValueSetCsv( Set dataElements, Set periods,
+Set orgUnits, Writer writer );
+
+void writeDataValueSetJson( Date lastUpdated, OutputStream outputStream );
public void writeDataValueSetJson( DataSet dataSet, Date completeDate, Period period, OrganisationUnit orgUnit,
Set dataElements, Set periods, Set orgUnits, OutputStream out );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-07-10 12:23:09 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-07-10 16:06:48 +
@@ -217,6 +217,12 @@
{
dataValueSetStore.writeDataValueSetJson( null, null, null, null, getDataElements( dataSets ), getPeriods( startDate, endDate ), getOrgUnits( orgUnits ), outputStream );
}
+
+@Override
+public void writeDataValueSetJson( Date lastUpdated, OutputStream outputStream )
+{
+dataValueSetStore.writeDataValueSetJson( lastUpdated, outputStream );
+}
@Override
public void writeDataValueSetCsv( Set dataSets, Date startDate, Date endDate, Set orgUnits, Writer writer )
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalues
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16078: dhis2-tools:
revno: 16078 committer: Bob Jolliffe branch nick: dhis2 timestamp: Thu 2014-07-10 19:05:30 +0100 message: dhis2-tools: Improved documentation. Added two new scripts: dhis2-clone to clone an instance dhis2-logtail to "tail" the logfile of an instance. added: tools/dhis2-tools-deb/pkg/usr/bin/dhis2-clone tools/dhis2-tools-deb/pkg/usr/bin/dhis2-logtail modified: tools/dhis2-tools-deb/docs/architecture.svg tools/dhis2-tools-deb/docs/manual.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 'tools/dhis2-tools-deb/docs/architecture.svg' --- tools/dhis2-tools-deb/docs/architecture.svg 2014-07-04 10:56:19 + +++ tools/dhis2-tools-deb/docs/architecture.svg 2014-07-10 18:05:30 + @@ -15,7 +15,10 @@ id="svg2" version="1.1" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="architecture.svg"> + sodipodi:docname="architecture.svg" + inkscape:export-filename="/home/bobj/src/dhis/test/dhis2/tools/dhis2-tools-deb/docs/architecture.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> @@ -650,7 +653,7 @@ image/svg+xml http://purl.org/dc/dcmitype/StillImage"; /> - + @@ -1088,22 +1091,6 @@ id="path5173" inkscape:connector-curvature="0" transform="translate(0,308.2677)" /> -MOHCCPremises - - Users - - + id="flowPara4295" /> === modified file 'tools/dhis2-tools-deb/docs/manual.xml' --- tools/dhis2-tools-deb/docs/manual.xml 2014-07-04 10:56:19 + +++ tools/dhis2-tools-deb/docs/manual.xml 2014-07-10 18:05:30 + @@ -33,15 +33,15 @@ -to provide a set of scripts to assist the administrator with tasks related to managing their -dhis2 system, beyond the one-off process of installation. +to provide a set of scripts to assist the administrator with tasks related to managing +their dhis2 system, beyond the one off process of installation. The package remains a work in progress and there are a number of areas where it could and should (and hopefully will be improved). For example, -currently the tuning of the postgresql database is not covered. There are ways in which - this could be at least semi-automated; +currently the tuning of the postgresql database is not covered. There are ways in which this +could be at least semi automated; nginx configuration is assisted by means of providing a sample configuration file. This configuration could be made more dynamic; the format of what is currently packaged is an Ubuntu linux deb package. There is @@ -50,43 +50,92 @@ - + + + + Architecture + The figure below shows the main components involved in a DHIS2 system. Single machine all-in-one installation - + + The dhis2-tools are primarily concerned with the creation and managing of the tomcat instances + which deliver the web application. As you can see in the diagram there may be one or more of these. + In addition the system requires a postgresql database server and an nginx web proxy server. There + are many possible configurations where these can be running on a different server than the dhis2 + instances. These tools for the most part assume that they are all installed together on the one machine. + Some customisation is required to separate them. + + + When an instance is created with the dhis2-create-instance command, a new user is created with the name + of the instance (lets say its called hmis). The home directory of that user is located at /var/lib/dhis2/hmis. + A database role is created also called hmis together with a database with the name of hmis. The DHIS2_HOME + environment variable for the instance is set to the same home directory of the user. + +The essential components of a standalone tomcat instance are also created within the same directory + (modelled after the ubuntu tomcat7-user package). The web.xml file of that tomcat instance has been customized + to allow an upstream web proxy server (such as nginx) to cache the static content of the dhis2 application. + + + The user will also have a crontab configuration automatically setup to manage daily backups, start on computer restart + and log file rotation. + + + Note that postgresql optimization, as described in the dhis2 user documentation, is not managed by this package and + needs to be done as a post-installation step.
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16079: dhis2-tools.
revno: 16079 committer: Bob Jolliffe branch nick: dhis2 timestamp: Thu 2014-07-10 19:18:59 +0100 message: dhis2-tools. Minor addition to manual. modified: tools/dhis2-tools-deb/docs/manual.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 'tools/dhis2-tools-deb/docs/manual.xml' --- tools/dhis2-tools-deb/docs/manual.xml 2014-07-10 18:05:30 + +++ tools/dhis2-tools-deb/docs/manual.xml 2014-07-10 18:18:59 + @@ -140,6 +140,13 @@ DHIS2 tools reference +The reference documentation for the commands contained in the package is listed in the + pages below. This documentation should also be included as man pages when the package is + installed. So for example you should be able to type +man dhis2-instance-create + to read the documentation for that command on the system. Typing +apropos dhis2 + will show you all the dhis2 related man pages. @@ -295,7 +302,7 @@ dhis2-clone Clones the database of one instance to another instance - + /usr/bin/dhis2-clone @@ -303,18 +310,21 @@ copy - + Description This command creates a copy of the database and war file of one instance into another instance. The main use case for this is where you want to setup an instance for training purposes. Trainees can be "let loose" on the training instance without fear of disturbing - the data or configuration of the production instance. They will however be working with the - same usernames, forms and reports which exist in the master. The command should be executed with - care as it will completely replace the existing database of the target instance -Scheduled datamart and analytics generation jobs are disabled in the target instance. -The command could conceivably be scheduled to run in the early morning to ensure that the database is -restored to a pristine state for the start of each day's training. Or it can be run on demand. + the data or configuration of the production instance. They will however be working with + the same usernames, forms and reports which exist in the master. The command should be + executed with care as it will completely replace the existing database of the target + instance +Scheduled datamart and analytics generation jobs are disabled in the target + instance. +The command could conceivably be scheduled to run in the early morning to ensure that + the database is restored to a pristine state for the start of each day's training. Or it + can be run on demand. Examples @@ -322,7 +332,7 @@ Creates a new instance called training from an existing instance called hmis. - + @@ -398,18 +408,18 @@ dhis2-logview Shows log file - + /usr/bin/dhis2-logview instance name - + Description -Use this tool to view log of dhis2 instance using less. Type ":q" to exit. -See the man page for less for tips in navigating and searching the file. +Use this tool to view log of dhis2 instance using less. Type ":q" to exit. See the man + page for less for tips in navigating and searching the file. Examples @@ -419,9 +429,9 @@ See also dhis2-logtail (1). - + - + @@ -430,16 +440,16 @@ dhis2-logtail -Shows the bottom log file in real time. Type Ctrl-C to exit. +Shows the bottom log file in real time. Type Ctrl-C to exit. - + /usr/bin/dhis2-logtail instance name - + Description Use this tool to show the log of dhis2 instance in real time. @@ -453,7 +463,7 @@ dhis2-logview (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 16080: dhis2-tools
revno: 16080 committer: Bob Jolliffe branch nick: dhis2 timestamp: Thu 2014-07-10 19:37:56 +0100 message: dhis2-tools Delete keySchedtasks when cloning. Not really sure about keyScheduledTasks. modified: tools/dhis2-tools-deb/pkg/usr/bin/dhis2-clone -- 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 'tools/dhis2-tools-deb/pkg/usr/bin/dhis2-clone' --- tools/dhis2-tools-deb/pkg/usr/bin/dhis2-clone 2014-07-10 18:05:30 + +++ tools/dhis2-tools-deb/pkg/usr/bin/dhis2-clone 2014-07-10 18:37:56 + @@ -31,6 +31,7 @@ psql -c "reassign owned by $1 to $2" $2 # disable midnight scheduled tasks on the clone psql -c "delete from systemsetting where name = 'keyScheduledTasks';" $2 +psql -c "delete from systemsetting where name = 'keySchedTasks';" $2 # make sure clone runs the same war file as master dhis2-deploy-war -f /var/lib/dhis2/$1/webapps/$1.war $2 ___ 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] Analytics running even without scheduling
Thanks a lot Lars, It seems to be working after deleting 'keySchedTasks'. Seid, On Thu, Jul 10, 2014 at 3:53 PM, Lars Helge Øverland wrote: > Hi, > > that sounds weird. Try deleting the system setting record that controls > scheduling and restart server. > > delete from systemsetting where name='keySchedTasks'; > > > > > On Thu, Jul 10, 2014 at 2:42 PM, Seid Hussein wrote: > >> Hi all, >> >> We have been facing a problem these days where we are trying to run the >> DHIS2 database locally even though it is working without a problem on our >> Amazon EC2 server. >> >> Whenever tomcat starts, it immediately goes to running analytics and we >> can not get in to any of the modules since it hangs up on that specific >> task. It hangs on like that for hours. This happens even if we have stopped >> the datamart and analytics schedule. >> >> I check my JAVA_OPTS and we have >> >> -Xmx4000m -Xms2000m -XX:MaxPermSize=500m -XX:PermSize=300m >> >> which should be more than enough. >> >> I have a 6GB RAM Windows 8.1 machine, with the latest java build. >> >> >> All the best, >> >> >> Seid, >> >> ___ >> 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 16081: Allow to remove longitude and latitude of event in TEI event form.
revno: 16081
committer: Tran Chau
branch nick: dhis2
timestamp: Fri 2014-07-11 11:42:51 +0700
message:
Allow to remove longitude and latitude of event in TEI event form.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveCoordinatesEventAction.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-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveCoordinatesEventAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveCoordinatesEventAction.java 2014-03-18 08:10:10 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveCoordinatesEventAction.java 2014-07-11 04:42:51 +
@@ -91,12 +91,9 @@
ProgramStageInstance programStageInstance = programStageInstanceService
.getProgramStageInstance( programStageInstanceId );
-if ( longitude != null && latitude != null )
-{
-programStageInstance.setLongitude( longitude );
-programStageInstance.setLatitude( latitude );
-}
-
+programStageInstance.setLongitude( longitude );
+programStageInstance.setLatitude( latitude );
+
programStageInstanceService.updateProgramStageInstance( programStageInstance );
return SUCCESS;
___
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 16082: Fixed bug - Exception thrown when to save TEI location without selecting any orgunit.
revno: 16082
committer: Tran Chau
branch nick: dhis2
timestamp: Fri 2014-07-11 12:28:48 +0700
message:
Fixed bug - Exception thrown when to save TEI location without selecting any
orgunit.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/RegisterTrackedEntityInstanceLocationAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceLocation.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/RegisterTrackedEntityInstanceLocationAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/RegisterTrackedEntityInstanceLocationAction.java 2014-03-18 08:10:10 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/trackedentity/RegisterTrackedEntityInstanceLocationAction.java 2014-07-11 05:28:48 +
@@ -38,7 +38,8 @@
/**
* @author Chau Thu Tran
*
- * @version $RegisterTrackedEntityInstanceLocationAction.java Mar 27, 2012 04:52:51 PM$
+ * @version $RegisterTrackedEntityInstanceLocationAction.java Mar 27, 2012
+ * 04:52:51 PM$
*/
public class RegisterTrackedEntityInstanceLocationAction
implements Action
@@ -46,7 +47,7 @@
// -
// Dependencies
// -
-
+
private SelectionTreeManager selectionTreeManager;
public void setSelectionTreeManager( SelectionTreeManager selectionTreeManager )
@@ -81,13 +82,15 @@
{
OrganisationUnit orgunit = selectionTreeManager.getReloadedSelectedOrganisationUnit();
-TrackedEntityInstance entityInstance = entityInstanceService.getTrackedEntityInstance( entityInstanceId );
-
-entityInstance.setOrganisationUnit( orgunit );
-
-entityInstanceService.addTrackedEntityInstance( entityInstance );
-
-return SUCCESS;
+if ( orgunit != null )
+{
+TrackedEntityInstance entityInstance = entityInstanceService.getTrackedEntityInstance( entityInstanceId );
+entityInstance.setOrganisationUnit( orgunit );
+entityInstanceService.updateTrackedEntityInstance( entityInstance );
+return SUCCESS;
+}
+
+return INPUT;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2014-07-09 03:43:23 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2014-07-11 05:28:48 +
@@ -693,4 +693,5 @@
filter_by_program = Filter by program
users = Users
message_is_sent = Message is sent
-messsage = Message
\ No newline at end of file
+messsage = Message
+please_select_an_orgunit = Please select an organisation unit
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2014-06-24 10:12:20 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2014-07-11 05:28:48 +
@@ -543,6 +543,8 @@
+ /dhis-web-commons/ajax/jsonResponseInput.vm
+
/dhis-web-commons/ajax/jsonResponseSuccess.vm
F_TRACKED_ENTITY_INSTANCE_CHANGE_LOCATION
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2014-07-10 07:17:45 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2014-07-11 05:28:48 +
@@ -107,8 +107,8 @@
$i18n.getString('use_data_from_level')
$i18n.getString('selected')
- $i18n.getString('children_only')
- $i18n.getString('all')
+ $i18n.getString('children_only')
+ $i18n.getString('all')
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16083: Hide waiting-div after showing the validation-result in case-entry form.
revno: 16083
committer: Tran Chau
branch nick: dhis2
timestamp: Fri 2014-07-11 12:37:24 +0700
message:
Hide waiting-div after showing the validation-result in case-entry form.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.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-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2014-07-08 06:30:54 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2014-07-11 05:37:24 +
@@ -508,15 +508,16 @@
});
$("#loading-bar").siblings(".ui-dialog-titlebar").hide();
-
+
$.get( 'validateProgram.action',
{
programStageInstanceId: jQuery('.stage-object-selected').attr('id').split('_')[1]
}).done(function(html){
$("#loading-bar").dialog("close");
$('#validateProgramDiv').html(html);
+
if( getFieldValue('violateValidation') == 'true' ) {
-$('#validateProgramDiv').dialog({
+$('#validateProgramDiv').dialog({
title: i18n_violate_validation,
maximize: true,
closable: true,
@@ -537,7 +538,8 @@
});
}
else {
-runCompleteEvent(isCreateEvent);
+ $("#loading-bar").dialog("close");
+ runCompleteEvent(isCreateEvent);
}
}
___
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
