[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 10769: Put comments into data entry form on Active programs tab of person dashboard.
revno: 10769 committer: Tran Chau branch nick: dhis2 timestamp: Mon 2013-05-06 16:00:15 +0700 message: Put comments into data entry form on Active programs tab of person dashboard. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.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/patientDashboard.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-05-06 07:12:06 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-05-06 09:00:15 + @@ -124,7 +124,14 @@ #end #set($flag = 'false') + #set($messages = "") #foreach( $programStageInstance in $programInstance.programStageInstances ) + + #foreach( $comment in $programStageInstance.patientComments ) + #set($messages = $messages + $format.formatDateTime($comment.createdDate) + ' ' + $comment.creator + ' ' + $comment.commentText + '' ) + #set( $mark = !$mark ) + #end + #set( $status = $programStageInstance.getEventStatus() ) #if( $status!=1 && $status!=5 && $flag=='false') #end + + + #if($messages!='') + $messages + #end + #end === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-04-18 09:56:44 + +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-05-06 09:00:15 + @@ -69,11 +69,11 @@ - $i18n.getString( "stored_by" ) + $i18n.getString( "stored_by" ): $!encoder.htmlEncode( $programInstance.patientComment.creator ) - $i18n.getString( "stored_date" ) + $i18n.getString( "stored_date" ): $!format.formatDate( $programInstance.patientComment.createdDate ) ___ 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 10770: [mobile] generate system identifier for patient
revno: 10770
committer: Long
branch nick: dhis2
timestamp: Mon 2013-05-06 16:24:22 +0700
message:
[mobile] generate system identifier for patient
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.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-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2013-04-04 18:06:19 +
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java 2013-05-06 09:24:22 +
@@ -35,12 +35,11 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.lang.math.NumberUtils;
import org.apache.struts2.StrutsStatics;
import org.hisp.dhis.light.utils.FormUtils;
+import org.hisp.dhis.light.utils.PatientIdentifierGenerator;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientAttribute;
@@ -59,7 +58,6 @@
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
-
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
@@ -478,7 +476,21 @@
}
}
}
-
+
+String identifier = PatientIdentifierGenerator.getNewIdentifier( patient.getBirthDate(), gender );
+
+PatientIdentifier systemGenerateIdentifier = patientIdentifierService.get( null, identifier );
+while ( systemGenerateIdentifier != null )
+{
+identifier = PatientIdentifierGenerator.getNewIdentifier( patient.getBirthDate(), patient.getGender() );
+systemGenerateIdentifier = patientIdentifierService.get( null, identifier );
+}
+
+systemGenerateIdentifier = new PatientIdentifier();
+systemGenerateIdentifier.setIdentifier( identifier );
+systemGenerateIdentifier.setPatient( patient );
+patient.getIdentifiers().add( systemGenerateIdentifier );
+
for ( PatientAttribute patientAttribute : patientAttributes )
{
patientAttributeSet.add( patientAttribute );
___
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 10771: Light, nicer top menu and click on logo goes to index page
revno: 10771
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Mon 2013-05-06 12:22:55 +0200
message:
Light, nicer top menu and click on logo goes to index page
modified:
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 2012-10-09 04:45:29 +
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm 2013-05-06 10:22:55 +
@@ -11,7 +11,7 @@
-
+
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css 2012-07-09 06:15:25 +
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/style/light.css 2013-05-06 10:22:55 +
@@ -93,7 +93,7 @@
*/
body div#header
{
-height : 20px;
+height : 21px;
background-color : #1d5288;
border-bottom: 2px solid #184572;
padding-top : 1px;
@@ -117,6 +117,12 @@
border : none;
}
+body img#logo
+{
+margin-top: 2px;
+margin-left: 8px;
+}
+
/*
* FOOTER
*
@@ -241,10 +247,9 @@
font-size: 0.9em;
padding-left : 2%;
padding-right: 2%;
+ padding-bottom : 0.2em;
color: black;
-background-color : #F6F6F6;
-border-top : 1px solid #D8D8D8;
-border-bottom: 2px solid #D8D8D8;
+border-bottom: 1px solid #D8D8D8;
margin-top : 0;
margin-bottom: 0.4em;
line-height : normal;
___
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] DHIS 2.11 - release workshop - now on YouTube
Dear all, The videos pertaining to the DHIS 2.11 release workshop held on the 8th April 2013 at the HISP laboratory, University of Oslo, are now uploaded to the DHIS academy Youtube channel. You can access the same via http://www.youtube.com/user/dhisvideo?feature=watch A separate playlist for the 'DHIS 2.11 release' has been created. Please feel free to drop in comments or questions related to each of the videos using the 'comments' option. The feedback we receive will be highly appreciated and will be considered in the future developments. You can also access the other DHIS training videos using the same channel. Thank you, Pandula Siribaddana for the DHIS Academy___ 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] DHIS2-Tracker API problem
Sir, I have keen interest in your project and very passionate about it . I have installed DHIS2 and I am currently running it , it works very well as your youtube channel(http://www.youtube.com/user/dhis2?feature=watch) helped a lot. I am planning to work on PROJECT IDEA :Dialplan (PBX) generation for patient communication , but facing some difficulty, I'm not able to find DHIS2-Tracker API that you have mentioned in your idea page (http://dhis2.org/gsoc2013) under Objectives. ___ 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] Building tools/dhis-adhoc/
Hi All, Can someone point me in the right direction to build the dhis-adhoc tools? I get a dependency error when trying to build. [ERROR] 'dependencies.dependency.version' for org.hisp.dhis:dhis-service-analytics:jar is missing. @ line 32, column 17 Are there some env vars I need to configure? Thanks, Dan ___ 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 10772: Made sure dhis-adhoc builds against trunk
revno: 10772 committer: Lars Helge Øverland branch nick: dhis2 timestamp: Mon 2013-05-06 20:21:24 +0200 message: Made sure dhis-adhoc builds against trunk modified: tools/dhis-adhoc/pom.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'tools/dhis-adhoc/pom.xml' --- tools/dhis-adhoc/pom.xml 2013-01-23 14:05:25 + +++ tools/dhis-adhoc/pom.xml 2013-05-06 18:21:24 + @@ -6,7 +6,7 @@ org.hisp.dhis dhis-services -2.11-SNAPSHOT +2.12-SNAPSHOT dhis-adhoc ___ 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] Building tools/dhis-adhoc/
Hi Dan, I have committed a fix which makes dhis-adhoc build against trunk now. Please update your source and see if it works now. The issue was likely that parent-version was 2.11-SNAPSHOT and you did not have that version of dhis source in your local maven repo - something that I accidentally have and hence did not notice this issue. cheers Lars On Mon, May 6, 2013 at 8:08 PM, Dan Cocos wrote: > Hi All, > > Can someone point me in the right direction to build the dhis-adhoc tools? > I get a dependency error when trying to build. > [ERROR] 'dependencies.dependency.version' for > org.hisp.dhis:dhis-service-analytics:jar is missing. @ line 32, column 17 > > Are there some env vars I need to configure? > > Thanks, > Dan > > > ___ > 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
