[Dhis2-devs] Report Tables Exception Errors
Hi all In migration DHSI2 v2.9 from Linux to Windows, all report tables are not working. any known issue Lungo ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8305: mobile: implemented reading messages (read-only for now)
revno: 8305
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Sun 2012-09-30 21:58:00 +0700
message:
mobile: implemented reading messages (read-only for now)
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2012-09-11 06:48:03 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2012-09-30 14:58:00 +
@@ -312,7 +312,6 @@
}
@JsonProperty
-@JsonSerialize( contentAs = BaseIdentifiableObject.class )
@JsonView( {DetailedView.class, ExportView.class} )
@JacksonXmlElementWrapper( localName = messages, namespace = Dxf2Namespace.NAMESPACE )
@JacksonXmlProperty( localName = message, namespace = Dxf2Namespace.NAMESPACE )
=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm 2012-09-29 03:50:36 +
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm 2012-09-30 14:58:00 +
@@ -1,4 +1,37 @@
+script
+jQuery(document).bind('pagebeforecreate',function(){
+jQuery.ajax({
+url: '$baseUrl/../api/messageConversations/${messageId}.json',
+async: false
+}).success(function(data) {
+var tmpl = jQuery('#message-template').html();
+
+jQuery('section[data-role=content]').html(
+_.template( tmpl, data )
+);
+
+console.log(data);
+}).error(function() {
+console.log('error fetching message')
+});
+});
+/script
+
+script id=message-template type=text/template
+ul data-role=listview data-inset=true
+li data-role=list-divider%= subject %/li
+% _( _( messages ).reverse() ).each( function(message, idx) { %
+% var d = new Date( message.lastUpdated ).toDateString(); %
+li
+h3%= message.sender.name %/h3
+p style=white-space: normal !important%= message.name %/p
+p class=ui-li-asidestrong%= d %/strong/p
+/li
+% }); %
+/ul
+/script
+
section data-role=page id=messagePage data-theme=c
header data-role=header data-theme=b
@@ -7,7 +40,6 @@
/header
section data-role=content
-h1Reading message $messageId./h1
/section
footer data-role=footer data-theme=b
=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm 2012-09-29 03:50:36 +
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm 2012-09-30 14:58:00 +
@@ -1,16 +1,17 @@
script
-$(document).bind('pagebeforecreate',function(){
-$.ajax({
+jQuery(document).bind('pagebeforecreate',function(){
+jQuery.ajax({
url: '../api/currentUser/inbox.json',
async: false
}).success(function(data) {
console.log(data);
-$.each(data.messageConversations, function(i, item) {
-$('#messageList').append('lia href=messages/' + item.id + '' + item.name + '/a/li');
+jQuery.each(data.messageConversations, function(i, item) {
+jQuery('#messageList').append('lia href=messages/' + item.id + '' + item.name + '/a/li');
});
}).error(function() {
+console.log(error fetching inbox);
});
});
/script
=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm 2012-09-29 03:50:36 +
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.vm 2012-09-30 14:58:00 +
@@ -9,7 +9,7 @@
$('#surnameInput').val(data.surname);
$('#emailInput').val(data.email);
$('#phoneNumberInput').val(data.phoneNumber);
-$('#job').val(data.jobTitle);
+
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8306: mobile: implemented reply to messageConversations
revno: 8306
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2012-10-01 00:01:41 +0700
message:
mobile: implemented reply to messageConversations
modified:
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.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-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm 2012-09-30 14:58:00 +
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm 2012-09-30 17:01:41 +
@@ -16,6 +16,29 @@
console.log('error fetching message')
});
});
+
+jQuery(document).bind('pageinit', function() {
+ $('#reply-form input:submit').bind('click', function() {
+var msg = jQuery('#reply-text').val();
+
+ if(msg.length == 0) {
+ return false;
+ }
+
+ $.ajax({
+ url : '$baseUrl/../api/messageConversations/${messageId}',
+ type: 'post',
+ contentType : 'text/plain',
+ data: msg
+ }).success(function () {
+ location.reload(true);
+ }).error(function () {
+ console.log(failed to send message);
+ });
+
+ return false;
+ });
+});
/script
script id=message-template type=text/template
@@ -28,6 +51,14 @@
p style=white-space: normal !important%= message.name %/p
p class=ui-li-asidestrong%= d %/strong/p
/li
+% if( idx == 0 ) { %
+li
+form id='reply-form'
+textarea id='reply-text'/textarea
+input type=submit value=Reply /
+/form
+/li
+% } %
% }); %
/ul
/script
___
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 8307: Async loading of interpretations
revno: 8307
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Sun 2012-09-30 19:45:22 +0200
message:
Async loading of interpretations
added:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.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-dashboard-integration/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-09-25 13:56:20 +
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-09-30 17:45:22 +
@@ -125,7 +125,7 @@
!-- Interpretation --
- action name=interpretation class=org.hisp.dhis.dashboard.interpretation.action.GetInterpretationsAction
+ action name=interpretation class=org.hisp.dhis.dashboard.action.NoAction
result name=success type=velocity/main.vm/result
param name=page/dhis-web-dashboard-integration/interpretation.vm/param
param name=menu/dhis-web-dashboard-integration/menu.vm/param
@@ -133,5 +133,9 @@
param name=stylesheetsstyle/dashboard.css/param
/action
+action name=getInterpretations class=org.hisp.dhis.dashboard.interpretation.action.GetInterpretationsAction
+ result name=success type=velocity/dhis-web-dashboard-integration/interpretationFeed.vm/result
+/action
+
/package
/struts
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm 2012-09-05 07:20:37 +
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm 2012-09-30 17:45:22 +
@@ -7,61 +7,6 @@
/div
div id=interpretationFeed
-#foreach( $ip in $interpretations )
-div class=interpretation
-
- div class=interpretationName
- span class=bold style=cursor:pointer onclick=showUserInfo( '${ip.user.id}' )${ip.user.name}/spannbsp;
- span class=grey${format.formatDate( $ip.created )}/span
- /div
- div class=interpretationText
- ${ip.text}
- /div
- div class=interpretationChart
- #if( $ip.chartInterpretation )
- img style=cursor:pointer
- src=../api/charts/${ip.chart.uid}/data?date=${format.formatDate( $ip.created )}width=530height=300
- onclick=javascript:window.location.href='../dhis-web-visualizer/app/index.html?id=${ip.chart.uid}date=${format.formatDate( $ip.created )}'
- title=$i18n.getString( 'click_to_view_in_data_visualizer' )
- #elseif( $ip.mapViewInterpretation )
- a class=bold
- title=$i18n.getString( 'click_to_view_in_gis' )
- href=../dhis-web-mapping/mapping/index.html?id=${ip.mapView.uid}$encoder.htmlEncode( $ip.mapView.name )/a
- #elseif( $ip.reportTableInterpretation )
- #if( $ip.organisationUnit )#set( $ou = ou= + $ip.organisationUnit.uid )#else#set( $ou = )#end
- a class=bold
- title=$i18n.getString( 'click_to_view_report_table' )
- href=../dhis-web-reporting/exportTable.action?uid=${ip.reportTable.uid}pe=${format.formatDate( $ip.created )}${ou}
- $encoder.htmlEncode( $ip.reportTable.name )/a
- #elseif( $ip.dataSetReportInterpretation )
- a class=bold
- title=$i18n.getString( 'click_to_view_data_set_report' )
- href=../dhis-web-reporting/showDataSetReportForm.action?ds=${ip.dataSet.uid}pe=${ip.period.isoDate}ou=${ip.organisationUnit.uid}
- $encoder.htmlEncode( $ip.dataSet.name )/a
- #end
- /div
-
- #set( $comments = $ip.comments )
- div class=interpretationCommentArea
- div id=comments${ip.uid}
- #foreach( $comment in $comments )
- div
- div class=interpretationName
-span class=bold pointer onclick=showUserInfo( '${comment.user.id}' )${comment.user.name}/spannbsp;
-span class=grey${format.formatDate( $comment.created )}/span
- /div
- /div
- div class=interpretationText
- ${comment.text}
- /div
- #end
- /div
- textarea id=commentArea${ip.uid} class=commentArea placeholder=$i18n.getString( 'add_a_comment' ).../textarea
- input type=button class=commentButton value=Post comment onclick=postComment( '${ip.uid}' )
- /div
-
-/div
-#end
/div
div id=userInfo class=page style=display:none/div
=== added file
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8308: Impl auto pagination on page scroll for interpretations
revno: 8308
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Sun 2012-09-30 22:23:50 +0200
message:
Impl auto pagination on page scroll for interpretations
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.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-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java 2012-05-29 21:23:47 +
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java 2012-09-30 20:23:50 +
@@ -40,6 +40,8 @@
public class GetInterpretationsAction
implements Action
{
+private static final int PAGE_SIZE = 6;
+
// -
// Dependencies
// -
@@ -52,6 +54,17 @@
}
// -
+// Input
+// -
+
+private Integer page;
+
+public void setPage( Integer page )
+{
+this.page = page;
+}
+
+// -
// Output
// -
@@ -61,16 +74,18 @@
{
return interpretations;
}
-
+
// -
// Action implementation
// -
public String execute()
{
+int first = page != null ? ( page * PAGE_SIZE ) : 0;
+
interpretationService.updateCurrentUserLastChecked();
-interpretations = interpretationService.getInterpretations( 0, 20 );
+interpretations = interpretationService.getInterpretations( first, PAGE_SIZE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-09-30 17:45:22 +
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-09-30 20:23:50 +
@@ -1,9 +1,52 @@
+var currentPage = 0;
+var pageLock = false;
+
$( document ).ready( function() {
$( .commentArea ).autogrow();
+
+ $( document ).scroll( function() {
+ isNextPage();
+ } );
+
$( #interpretationFeed ).load( getInterpretations.action );
} );
+function isNextPage()
+{
+ var fromTop = $( document ).scrollTop();
+ var height = $( document ).height();
+ var threshold = 0.7;
+ var loaded = parseFloat( parseFloat( fromTop ) / parseFloat( height ) );
+
+ if ( loaded = threshold )
+ {
+ loadNextPage();
+ }
+}
+
+function loadNextPage()
+{
+ if ( pageLock == true )
+ {
+ return false;
+ }
+
+ pageLock = true;
+ currentPage++;
+
+ $.get( getInterpretations.action, { page: currentPage }, function( data ) {
+ $( #interpretationFeed ).append( data );
+
+ if ( !isDefined ( data ) || $.trim( data ).length == 0 )
+ {
+ $( document ).off( scroll );
+ }
+
+ pageLock = false;
+ } );
+}
+
function showUserInfo( id )
{
$( #userInfo ).load( ../dhis-web-commons-ajax-html/getUser.action?id= + id, function() {
___
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 587: Updated postgresql installation with a few config options which will improve performance
revno: 587 committer: Lars Helge Øverland larshe...@gmail.com branch nick: dhis2-docbook-docs timestamp: Sun 2012-09-30 22:39:51 +0200 message: Updated postgresql installation with a few config options which will improve performance 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 2012-09-07 02:48:46 + +++ src/docbkx/en/dhis2_implementation_guide_installation.xml 2012-09-30 20:39:51 + @@ -45,7 +45,11 @@ paraand set the following properties:/para paracodeshared_buffers = 512MB/code/para paraDetermines how much memory PostgreSQL can use for caching of query data. Is set too low by default since it depends on kernel shared memory which is low on some operating systems./para -paracodeeffective_cache_size = 3500MB/code/para +paracodework_mem = 12MB/code/para +paraDetermines the amount of memory used for internal sort and hash operations./para +paracodemaintenance_work_mem = 128MB/code/para +paraDetermines the amount of memory PostgreSQL can use for maintenance operations such as creating indexes, running vacuum, adding foreign keys. Incresing this value might improve performance of index creation during the data mart process./para +paracodeeffective_cache_size = 3300MB/code/para paraAn estimate of how much memory is available for caching (not an allocation) and is used by PostgreSQL to determine whether a query plan will fit into memory or not (setting it too high might result in unpredictable and slow behavior)./para paracodecheckpoint_segments = 32/code/para paraPostgreSQL writes new transactions to a log file called WAL segments which are 16MB in size. When a number of segments have been written a checkpoint occurs. Setting this number to a larger value will thus improve performance for write-heavy systems such as DHIS 2./para ___ 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] Solved - Re: Report Tables Exception Errors
It was due to browser compatibility. Lungo From: Juma Lungo jlu...@yahoo.com To: dhis2-devs dhis2-devs@lists.launchpad.net Sent: Sunday, September 30, 2012 12:31 PM Subject: Report Tables Exception Errors Hi all In migration DHSI2 v2.9 from Linux to Windows, all report tables are not working. any known issue Lungo___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8309: Remove stageInProgram in program-stage.
revno: 8309
committer: Tran Chau tran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Mon 2012-10-01 10:06:32 +0700
message:
Remove stageInProgram in program-stage.
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageInstanceComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageOrderComparator.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml
dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/SaveProgramStageSortOrderAction.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/ProgramStage.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2012-09-25 03:50:14 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2012-10-01 03:06:32 +
@@ -40,14 +40,21 @@
extends BaseIdentifiableObject
{
public static final String TYPE_DEFAULT = default;
+
public static final String TYPE_SECTION = section;
+
public static final String TYPE_CUSTOM = custom;
-
+
public static final String TEMPLATE_MESSSAGE_PATIENT_NAME = {patient-name};
+
public static final String TEMPLATE_MESSSAGE_PROGRAM_NAME = {program-name};
+
public static final String TEMPLATE_MESSSAGE_PROGAM_STAGE_NAME = {program-stage-name};
+
public static final String TEMPLATE_MESSSAGE_DUE_DATE = {due-date};
+
public static final String TEMPLATE_MESSSAGE_ORGUNIT_NAME = {orgunit-name};
+
public static final String TEMPLATE_MESSSAGE_DAYS_SINCE_DUE_DATE = {days-since-due-date};
/**
@@ -57,8 +64,6 @@
private String description;
-private int stageInProgram;
-
private int minDaysFromStart;
private Boolean irregular;
@@ -74,11 +79,11 @@
private Integer standardInterval;
private String reportDateDescription;
-
+
private SetPatientReminder patientReminders = new HashSetPatientReminder();
-
+
private Boolean autoGenerateEvent = true;
-
+
// -
// Constructors
// -
@@ -136,7 +141,7 @@
// -
// Getters and setters
// -
-
+
public DataEntryForm getDataEntryForm()
{
return dataEntryForm;
@@ -197,16 +202,6 @@
this.irregular = irregular;
}
-public int getStageInProgram()
-{
-return stageInProgram;
-}
-
-public void setStageInProgram( int stageInProgram )
-{
-this.stageInProgram = stageInProgram;
-}
-
public int getMinDaysFromStart()
{
return minDaysFromStart;
@@ -246,7 +241,7 @@
{
this.reportDateDescription = reportDateDescription;
}
-
+
public Boolean getAutoGenerateEvent()
{
return autoGenerateEvent;
@@ -271,7 +266,7 @@
return TYPE_DEFAULT;
}
-
+
public String getDefaultTemplateMessage()
{
return Dear {person-name}, please come to your appointment on {program-stage-name} at {due-date};
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageInstanceComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageInstanceComparator.java 2011-03-01 08:15:27 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageInstanceComparator.java 1970-01-01 00:00:00 +
@@ -1,14 +0,0 @@
-package org.hisp.dhis.program.comparator;
-
-import java.util.Comparator;
-
-import org.hisp.dhis.program.ProgramStageInstance;
-
-public class ProgramStageInstanceComparator implements ComparatorProgramStageInstance
-{
-public
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8310: mobile: minor changes, also working on new-message ui (work in progress, unsure how to handle mul...
revno: 8310
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Mon 2012-10-01 11:01:22 +0700
message:
mobile: minor changes, also working on new-message ui (work in progress,
unsure how to handle multiple orgunits/user/usergroups..)
added:
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/interpretations.vm
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/new-message.vm
modified:
dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/settings.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-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java 2012-09-29 03:50:36 +
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java 2012-10-01 04:01:22 +
@@ -71,6 +71,15 @@
return base;
}
+@RequestMapping( value = /messages/new-message )
+public String newMessage( Model model, HttpServletRequest request )
+{
+model.addAttribute( baseUrl, ContextUtils.getRootPath( request ) );
+model.addAttribute( page, new-message.vm );
+
+return base;
+}
+
@RequestMapping( value = /messages/{uid} )
public String message( @PathVariable( uid ) String uid, Model model, HttpServletRequest request )
{
@@ -81,6 +90,15 @@
return base;
}
+@RequestMapping( value = /interpretations )
+public String interpretations( Model model, HttpServletRequest request )
+{
+model.addAttribute( baseUrl, ContextUtils.getRootPath( request ) );
+model.addAttribute( page, interpretations.vm );
+
+return base;
+}
+
@RequestMapping( value = /settings )
public String settings( Model model, HttpServletRequest request )
{
=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm 2012-09-29 03:50:36 +
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm 2012-10-01 04:01:22 +
@@ -5,8 +5,13 @@
url: '../api/currentUser/dashboard.json',
async: false
}).success(function(data) {
-$('#messages a').append(span class='ui-li-count' + data.unreadMessageConversation + /span);
-$('#interpretations a').append(span class='ui-li-count' + data.unreadInterpretations + /span);
+if( data.unreadMessageConversation 0 ) {
+$('#messages a').append(span class='ui-li-count' + data.unreadMessageConversation + /span);
+}
+
+if( data.unreadInterpretations 0 ) {
+$('#interpretations a').append(span class='ui-li-count' + data.unreadInterpretations + /span);
+}
}).error(function() {
$('#messages a').append(span class='ui-li-count'Offline/span)
$('#interpretations a').append(span class='ui-li-count'Offline/span)
@@ -14,7 +19,7 @@
});
/script
-section data-role=page id=mainPage data-theme=c
+section data-role=page id=index-page data-theme=c
header data-role=header data-theme=b
div align=centerimg src=$baseUrl/../dhis-web-commons/css/light_blue/logo_banner.png //div
=== added file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/interpretations.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/interpretations.vm 1970-01-01 00:00:00 +
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/interpretations.vm 2012-10-01 04:01:22 +
@@ -0,0 +1,16 @@
+
+section data-role=page id=interpretations-page data-theme=c
+
+ header data-role=header data-theme=b
+ div align=centerimg src=$baseUrl/../dhis-web-commons/css/light_blue/logo_banner.png //div
+a href=index data-icon=backBack/a
+ /header
+
+ section data-role=content
+ /section
+
+footer data-role=footer data-theme=b
+h1/h1
+ /footer
+
+/section
=== modified file
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8311: Minor fix for auto sending sms.
revno: 8311
committer: Tran Chau tran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Mon 2012-10-01 11:09:27 +0700
message:
Minor fix for auto sending sms.
modified:
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageListAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/schedule/ExecuteSendMessageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.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/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java 2012-09-25 06:44:53 +
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java 2012-10-01 04:09:27 +
@@ -73,8 +73,8 @@
// Constructors
// -
-public SendScheduledMessageTask( ProgramStageInstanceService programStageInstanceService, JdbcTemplate jdbcTemplate,
-OutboundSmsService outboundSmsService )
+public SendScheduledMessageTask( ProgramStageInstanceService programStageInstanceService,
+JdbcTemplate jdbcTemplate, OutboundSmsService outboundSmsService )
{
this.programStageInstanceService = programStageInstanceService;
this.jdbcTemplate = jdbcTemplate;
@@ -122,27 +122,22 @@
{
String message = schedulingProgramObject.getMessage();
-String phoneNumber = schedulingProgramObject.getPhoneNumber();
-
-if ( phoneNumber != null !phoneNumber.isEmpty() )
-{
-try
-{
-OutboundSms outboundSms = new OutboundSms( message, phoneNumber );
-outboundSms.setSender( DHIS_SYSTEM_SENDER );
-outboundSmsService.saveOutboundSms( outboundSms );
-
-String sql = INSERT INTO programstageinstance_outboundsms
-+ ( programstageinstanceid, outboundsmsid, sort_order) VALUES + (
-+ schedulingProgramObject.getProgramStageInstanceId() + , + outboundSms.getId() + ,
-+ (System.currentTimeMillis() / 1000) + ) ;
-
-jdbcTemplate.execute( sql );
-}
-catch ( SmsServiceException e )
-{
-message = e.getMessage();
-}
+try
+{
+OutboundSms outboundSms = new OutboundSms( message, schedulingProgramObject.getPhoneNumber() );
+outboundSms.setSender( DHIS_SYSTEM_SENDER );
+outboundSmsService.saveOutboundSms( outboundSms );
+
+String sql = INSERT INTO programstageinstance_outboundsms
++ ( programstageinstanceid, outboundsmsid, sort_order) VALUES + (
++ schedulingProgramObject.getProgramStageInstanceId() + , + outboundSms.getId() + ,
++ (System.currentTimeMillis() / 1000) + ) ;
+
+jdbcTemplate.execute( sql );
+}
+catch ( SmsServiceException e )
+{
+message = e.getMessage();
}
}
}
@@ -150,6 +145,7 @@
private void sendMessage()
{
ListOutboundSms outboundSmsList = outboundSmsService.getOutboundSms( OutboundSmsStatus.OUTBOUND );
+
for ( OutboundSms outboundSms : outboundSmsList )
{
outboundSms.setStatus( OutboundSmsStatus.SENT );
=== modified file 'dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java'
--- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java 2012-09-14 09:11:26 +
+++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java 2012-10-01 04:09:27 +
@@ -107,7 +107,7 @@
String sql = select osm.id as outboundsmsid, message, ore.elt as phonenumber
+ from outbound_sms osm inner join outbound_sms_recipients ore
+ on osm.id=ore.outbound_sms_id where
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8312: [mobile] apply validation rule for program stage form
revno: 8312
committer: Long Long@Long-Laptop
branch nick: dhis2
timestamp: Mon 2012-10-01 11:36:31 +0700
message:
[mobile] apply validation rule for program stage form
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.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/patient/ProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java 2012-09-22 12:23:40 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java 2012-10-01 04:36:31 +
@@ -32,7 +32,6 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-
import org.hisp.dhis.caseentry.state.SelectedStateManager;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.patient.PatientAttribute;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java 2012-07-16 08:15:37 +
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java 2012-10-01 04:36:31 +
@@ -27,6 +27,16 @@
package org.hisp.dhis.light.namebaseddataentry.action;
+import static org.hisp.dhis.program.ProgramValidation.AFTER_CURRENT_DATE;
+import static org.hisp.dhis.program.ProgramValidation.AFTER_DUE_DATE;
+import static org.hisp.dhis.program.ProgramValidation.AFTER_OR_EQUALS_TO_CURRENT_DATE;
+import static org.hisp.dhis.program.ProgramValidation.AFTER_OR_EQUALS_TO_DUE_DATE;
+import static org.hisp.dhis.program.ProgramValidation.BEFORE_CURRENT_DATE;
+import static org.hisp.dhis.program.ProgramValidation.BEFORE_DUE_DATE;
+import static org.hisp.dhis.program.ProgramValidation.BEFORE_DUE_DATE_PLUS_OR_MINUS_MAX_DAYS;
+import static org.hisp.dhis.program.ProgramValidation.BEFORE_OR_EQUALS_TO_CURRENT_DATE;
+import static org.hisp.dhis.program.ProgramValidation.BEFORE_OR_EQUALS_TO_DUE_DATE;
+
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import org.apache.struts2.ServletActionContext;
@@ -38,19 +48,26 @@
import org.hisp.dhis.api.mobile.model.ProgramStage;
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.i18n.I18n;
+import org.hisp.dhis.i18n.I18nFormat;
import org.hisp.dhis.light.utils.NamebasedUtils;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientService;
+import org.hisp.dhis.patientdatavalue.PatientDataValueService;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramStageDataElement;
import org.hisp.dhis.program.ProgramStageDataElementService;
+import org.hisp.dhis.program.ProgramStageInstance;
+import org.hisp.dhis.program.ProgramStageInstanceService;
import org.hisp.dhis.program.ProgramStageService;
+import org.hisp.dhis.program.ProgramValidation;
+import org.hisp.dhis.program.ProgramValidationService;
import org.hisp.dhis.util.ContextUtils;
-
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -147,6 +164,42 @@
this.programStageDataElementService = programStageDataElementService;
}
+private PatientDataValueService patientDataValueService;
+
+public PatientDataValueService getPatientDataValueService()
+{
+return patientDataValueService;
+}
+
+public void setPatientDataValueService( PatientDataValueService patientDataValueService )
+{
+this.patientDataValueService = patientDataValueService;
+}
+
+private ProgramValidationService programValidationService;
+
+public ProgramValidationService getProgramValidationService()
+{
+return programValidationService;
+}
+
+public void
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 8313: Error in auto-send sms messages.
revno: 8313
committer: Tran Chau tran.hispviet...@gmail.com
branch nick: dhis2
timestamp: Mon 2012-10-01 11:52:51 +0700
message:
Error in auto-send sms messages.
modified:
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/schedule/ExecuteSendMessageAction.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-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java'
--- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java 2012-10-01 04:09:27 +
+++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java 2012-10-01 04:52:51 +
@@ -104,10 +104,9 @@
realStatus = OutboundSmsStatus.ERROR.ordinal();
}
-String sql = select osm.id as outboundsmsid, message, ore.elt as phonenumber
+String sql = select osm.id as outboundsmsid, message, ore.elt as phonenumber, date
+ from outbound_sms osm inner join outbound_sms_recipients ore
+ on osm.id=ore.outbound_sms_id where status = + realStatus ;
-
try
{
ListOutboundSms OutboundSmsList = jdbcTemplate.query( sql, new RowMapperOutboundSms()
@@ -117,9 +116,10 @@
{
OutboundSms outboundSms = new OutboundSms( rs.getString( 2 ), rs.getString( 3 ) );
outboundSms.setId( rs.getInt( 1 ) );
+outboundSms.setDate( rs.getDate( 4 ) );
return outboundSms;
}
-} );
+});
return OutboundSmsList;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/schedule/ExecuteSendMessageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/schedule/ExecuteSendMessageAction.java 2012-10-01 04:09:27 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/schedule/ExecuteSendMessageAction.java 2012-10-01 04:52:51 +
@@ -80,15 +80,15 @@
@Override
public String execute()
{
-
CollectionSchedulingProgramObject schedulingProgramObjects = programStageInstanceService
.getSendMesssageEvents();
for ( SchedulingProgramObject schedulingProgramObject : schedulingProgramObjects )
{
String message = schedulingProgramObject.getMessage();
+
String phoneNumber = schedulingProgramObject.getPhoneNumber();
-
+
try
{
OutboundSms outboundSms = new OutboundSms( message, phoneNumber );
___
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 8314: Error when to open program-stage management form.
revno: 8314 committer: Tran Chau tran.hispviet...@gmail.com branch nick: dhis2 timestamp: Mon 2012-10-01 12:30:38 +0700 message: Error when to open program-stage management form. modified: dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.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/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-10-01 03:06:32 + +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-10-01 05:30:38 + @@ -134,7 +134,7 @@ executeSql( UPDATE program SET generatedByEnrollmentDate=false WHERE generatedByEnrollmentDate is null ); -executeSql( ALTER TABLE programstage DROP COLUMN stageInProgram ); +executeSql( ALTER TABLE programstage DROP COLUMN stageinprogram ); } // - === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2012-09-25 05:18:34 + +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2012-10-01 05:30:38 + @@ -22,7 +22,7 @@ property name=dateOfIncidentDescription type=text not-null=true / -set name=programStages order-by=stageinprogram cascade=all +set name=programStages order-by=mindaysfromstart cascade=all key column=programid / one-to-many class=org.hisp.dhis.program.ProgramStage / /set === modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml' --- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml 2012-10-01 03:06:32 + +++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml 2012-10-01 05:30:38 + @@ -22,7 +22,7 @@ property name=irregular column=irregular / -set name=programStageDataElements order-by=sort_order +set name=programStageDataElements order-by=sort_order cascade=all key column=programstageid / one-to-many class=org.hisp.dhis.program.ProgramStageDataElement / /set ___ 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
