[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 3176: Don't seach patients by full-name and select a patient from searching result by full-name.

2011-03-28 Thread noreply

revno: 3176
committer: Tran Chau 
branch nick: dhis2
timestamp: Mon 2011-03-28 14:13:35 +0700
message:
  Don't seach patients by full-name and select a patient from searching result 
by full-name.
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientsByNameAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/resultSearchPatients.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-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientsByNameAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientsByNameAction.java	2011-01-21 09:18:56 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/GetPatientsByNameAction.java	2011-03-28 07:13:35 +
@@ -80,28 +80,30 @@
 
 public String execute()
 {
-	int startIndex = fullName.indexOf( ' ' );
+fullName = fullName.trim();
+
+int startIndex = fullName.indexOf( ' ' );
 int endIndex = fullName.lastIndexOf( ' ' );
 
 String firstName = fullName.toString();
 String middleName = "";
 String lastName = "";
 
-if( startIndex != -1 )
+if ( fullName.indexOf( ' ' ) != -1 )
 {
 firstName = fullName.substring( 0, startIndex );
 if ( startIndex == endIndex )
 {
 middleName = "";
-lastName = fullName.substring( startIndex, fullName.length() );
+lastName = fullName.substring( startIndex + 1, fullName.length() );
 }
 else
 {
 middleName = fullName.substring( startIndex + 1, endIndex );
-lastName = fullName.substring( endIndex, fullName.length() );
+lastName = fullName.substring( endIndex + 1, fullName.length() );
 }
 }
-
+   
 patients = new ArrayList( patientService.getPatients( firstName + " " + middleName + " " + lastName ) );
 
 return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/resultSearchPatients.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/resultSearchPatients.vm	2011-01-20 02:12:00 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/resultSearchPatients.vm	2011-03-28 07:13:35 +
@@ -2,18 +2,18 @@
 
 
 #if($!patients)
-	
+	
 		$i18n.getString('full_name')
 		$i18n.getString( "age" )
 		$i18n.getString( "gender" )
 		$i18n.getString( "dob_type" )
 		$i18n.getString( "date_of_birth" )
 		$i18n.getString( "orgunit" )
-	
+	
 	
 		#set($mark = false)
 		#foreach( $patient  in $patients )
-			
+			
 $!patient.getFullName()
 $!patient.getAge()
 $!patient.gender

___
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 744060] Re: Don't select a patient from searching result by full-name

2011-03-28 Thread Thu Tran
** Changed in: dhis2
 Assignee: (unassigned) => Thu Tran (tran-hispvietnam)

** 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/744060

Title:
  Don't select a patient from searching result by full-name

Status in DHIS 2 - District Health Information Software:
  Fix Committed

Bug description:
  Don't select a patient from searching result by full-name ( patient
  module ).

___
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 3177: (local vn) - Fixed NPE.

2011-03-28 Thread noreply

revno: 3177
committer: Hieu 
branch nick: dhis2
timestamp: Mon 2011-03-28 14:23:41 +0700
message:
  (local vn) - Fixed NPE.
modified:
  
local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java
  
local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/configuration/action/SetReportConfigurationAction.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 'local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java'
--- local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java	2011-03-25 09:11:30 +
+++ local/vn/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportLocationManager.java	2011-03-28 07:23:41 +
@@ -116,14 +116,21 @@
 
 public File getReportExcelTemplateDirectory()
 {
-File templateDirectory = new File( REPORT, (String) systemSettingManager
-.getSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY ) );
+String pathConfig = (String) systemSettingManager
+.getSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY );
+
+if ( pathConfig == null )
+{
+return null;
+}
+
+File templateDirectory = new File( REPORT, pathConfig );
 
 if ( !templateDirectory.exists() )
 {
 templateDirectory.mkdirs();
 }
-
+
 return templateDirectory;
 }
 

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/configuration/action/SetReportConfigurationAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/configuration/action/SetReportConfigurationAction.java	2011-03-25 09:11:30 +
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/configuration/action/SetReportConfigurationAction.java	2011-03-28 07:23:41 +
@@ -29,6 +29,8 @@
 
 import static org.apache.commons.io.FileUtils.deleteDirectory;
 
+import java.io.File;
+
 import org.hisp.dhis.options.SystemSettingManager;
 import org.hisp.dhis.reportexcel.ReportLocationManager;
 
@@ -77,8 +79,13 @@
 
 public String execute()
 throws Exception
-{
-deleteDirectory ( reportLocationManager.getReportExcelTemplateDirectory() );
+{   
+File templateDir = reportLocationManager.getReportExcelTemplateDirectory();
+
+if ( templateDir != null && templateDir.exists() )
+{
+deleteDirectory ( reportLocationManager.getReportExcelTemplateDirectory() );
+}
 
 systemSettingManager.saveSystemSetting( SystemSettingManager.KEY_REPORT_TEMPLATE_DIRECTORY, templateDirectory );
 

___
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 744075] [NEW] Patient enrolls programs which belong to the selected organisation unit

2011-03-28 Thread Thu Tran
Public bug reported:

Patient should enroll programs which belong to the selected organisation
unit.

** Affects: dhis2
 Importance: Undecided
 Assignee: Thu Tran (tran-hispvietnam)
 Status: New

** 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/744075

Title:
  Patient enrolls programs which belong to the selected organisation
  unit

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Patient should enroll programs which belong to the selected
  organisation unit.

___
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 3178: Fix bug: Patient enrolls programs which belong to the selected organisation unit.

2011-03-28 Thread noreply

revno: 3178
committer: Tran Chau 
branch nick: dhis2
timestamp: Mon 2011-03-28 14:46:07 +0700
message:
  Fix bug: Patient enrolls programs which belong to the selected organisation 
unit.
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.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-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java	2011-01-11 07:06:28 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java	2011-03-28 07:46:07 +
@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientService;
 import org.hisp.dhis.patient.state.SelectedStateManager;
@@ -71,7 +72,7 @@
 {
 this.programService = programService;
 }
-
+
 // -
 // Input/Output
 // -
@@ -168,7 +169,8 @@
 // Load Programs
 // -
 
-programs = programService.getAllPrograms();
+programs = programService.getPrograms( selectedStateManager.getSelectedOrganisationUnit() );
+//programs = programService.getAllPrograms();
 
 // -
 // Validate selected Program

___
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 744052] Re: can't Add new orgunit

2011-03-28 Thread Morten Olav Hansen
Can you clear the cache and try again? this should have been fixed
already..

** Changed in: dhis2
 Assignee: (unassigned) => Morten Olav Hansen (mortenoh)

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744052

Title:
  can't Add new orgunit

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  There are some text field such as Name, Short name, URL,... don't
  allow enter text when Add new org unit. I'm using Firefox/3.6.16

___
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 3179: (local vn) - Removed unused bean.

2011-03-28 Thread noreply

revno: 3179
committer: Hieu 
branch nick: dhis2
timestamp: Mon 2011-03-28 15:34:07 +0700
message:
  (local vn) - Removed unused bean.
modified:
  local/vn/dhis-web-excel-reporting/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 'local/vn/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-03-25 09:11:30 +
+++ local/vn/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml	2011-03-28 08:34:07 +
@@ -24,14 +24,6 @@
 			ref="org.hisp.dhis.reportexcel.ReportLocationManager" />
 	
 
-	
-		
-		
-	
-
 	
 
 	
 	
 
-	
-	
-		
-		
-	
-
-
-
 	
 
 	
 	
-
+		
+	
+		
+		
+	
+	
 	
 		

___
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 744075] Re: Patient enrolls programs which belong to the selected organisation unit

2011-03-28 Thread Thu Tran
** 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/744075

Title:
  Patient enrolls programs which belong to the selected organisation
  unit

Status in DHIS 2 - District Health Information Software:
  Fix Committed

Bug description:
  Patient should enroll programs which belong to the selected
  organisation unit.

___
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 3180: Minor fix.

2011-03-28 Thread noreply

revno: 3180
committer: Tran Chau 
branch nick: dhis2
timestamp: Mon 2011-03-28 16:08:01 +0700
message:
  Minor fix.
modified:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties


--
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/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	2011-03-22 02:17:23 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2011-03-28 09:08:01 +
@@ -79,7 +79,7 @@
 use_custom_form = Use custom form
 report_date_warning 			= Please choose Report date before entering data for this Program stage
 other_facility 	= Private facility
-org_unit_name 	= Provied by
+org_unit_name 	= Provided by
 program_stage_name = Program stage name
 datae_element_name = Data element name
 not_available 	= Not available
@@ -289,3 +289,4 @@
 case_aggregation= Beneficiary Aggregation
 please_specify_an_orgunit		= Please specify an organisation unit
 please_select_to_date_greater_or_equals_to_from_date			= Please select to-date greater or equals to from-date
+violate_validation= Violate validation

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-03-28 06:06:26 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-03-28 09:08:01 +
@@ -34,7 +34,7 @@
 removing_representative_failed = Removing representative failed
 saving_representative_failed = Saving representative failed
 adding_relationship_failed = Adding relationship failed
-relationship_management = Relationship management
+relationship_management = Manage Relationship
 please_select = Please Select
 patients_and_programs = Beneficiaries and Programs
 is = IS
@@ -457,3 +457,4 @@
 search_by_program = Search by Program
 select_program = Select program
 list_patients_by_program = List Beneficiaries by Program
+manage_program_unenrollment = Manage Program Un-Enrollment

___
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] Build failed in Jenkins: Dhis2 Service Trunk » DHIS API #2350

2011-03-28 Thread support
See 


--
[INFO] Setting property: classpath.resource.loader.class => 
'org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader'.
[INFO] Setting property: velocimacro.messages.on => 'false'.
[INFO] Setting property: resource.loader => 'classpath'.
[INFO] Setting property: resource.manager.logwhenfound => 'false'.
[INFO] ** 
[INFO] Starting Jakarta Velocity v1.4
[INFO] RuntimeInstance initializing.
[INFO] Default Properties File: 
org/apache/velocity/runtime/defaults/velocity.properties
[INFO] Default ResourceManager initializing. (class 
org.apache.velocity.runtime.resource.ResourceManagerImpl)
[INFO] Resource Loader Instantiated: 
org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader
[INFO] ClasspathResourceLoader : initialization starting.
[INFO] ClasspathResourceLoader : initialization complete.
[INFO] ResourceCache : initialized. (class 
org.apache.velocity.runtime.resource.ResourceCacheImpl)
[INFO] Default ResourceManager initialization complete.
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Literal
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Macro
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Parse
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Include
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
[INFO] Created: 20 parsers.
[INFO] Velocimacro : initialization starting.
[INFO] Velocimacro : adding VMs from VM library template : VM_global_library.vm
[ERROR] ResourceManager : unable to find resource 'VM_global_library.vm' in any 
resource loader.
[INFO] Velocimacro : error using  VM library template VM_global_library.vm : 
org.apache.velocity.exception.ResourceNotFoundException: Unable to find 
resource 'VM_global_library.vm'
[INFO] Velocimacro :  VM library template macro registration complete.
[INFO] Velocimacro : allowInline = true : VMs can be defined inline in templates
[INFO] Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT 
replace previous VM definitions
[INFO] Velocimacro : allowInlineLocal = false : VMs defined inline will be  
global in scope if allowed.
[INFO] Velocimacro : initialization complete.
[INFO] Velocity successfully started.
[INFO] [findbugs:findbugs {execution: default-cli}]
[INFO]   Using source root:
[INFO] /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 
Service Trunk/workspace/dhis-2/target/classes
[INFO]   Using test source root:
[INFO] /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 
Service Trunk/workspace/dhis-2/target/test-classes
[INFO] Output class directory doesn't exist. Skipping findbugs.
[INFO] 
[INFO] Building DHIS API
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 330 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Compiling 18 source files to 

[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 
Service 
Trunk/modules/org.hisp.dhis$dhis-api/builds/2011-03-28_11-31-02/archive/org.hisp.dhis/dhis-api/2.2-SNAPSHOT/pom.xml
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure
:[39,7]
 error while writing org.hisp.dhis.mock.MockI18nFormat: Disk quota exceeded


[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 50 seconds
[INFO] Finished at: Mon Mar 28 11:32:00 CEST 2011
[INFO] Final Memory: 36M/117M
[INFO] 

[Dhis2-devs] Build failed in Jenkins: Dhis2 Service Trunk #2350

2011-03-28 Thread support
See 

Changes:

[Tran Chau] Minor fix.

--
Started by an SCM change
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3179 hieu.hispviet...@gmail.com-20110328083407-f887ldn7xd3khlka
" stderr: ""
[workspace] $ bzr pull --overwrite 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
 M  
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
 M  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
All changes applied successfully.
Now on revision 3180.
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3180 tran.hispviet...@gmail.com-20110328090801-1ogfae5ek2v1abu5
" stderr: ""
[workspace] $ bzr log -v -r 
revid:hieu.hispviet...@gmail.com-20110328083407-f887ldn7xd3khlka..revid:tran.hispviet...@gmail.com-20110328090801-1ogfae5ek2v1abu5
 --long --show-ids
Getting local revision...
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3180 tran.hispviet...@gmail.com-20110328090801-1ogfae5ek2v1abu5
" stderr: ""
RevisionState revno:3180 
revid:tran.hispviet...@gmail.com-20110328090801-1ogfae5ek2v1abu5
Found mavenVersion 2.2.1 from file 
jar:file:/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties
Parsing POMs
[dhis-2] $ /local/opt/j2sdk/bin/java -Xmx2048m -XX:MaxPermSize=512m -cp 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.396.jar:/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1/boot/classworlds-1.1.jar
 hudson.maven.agent.Main 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/tomcat/webapps/ci/WEB-INF/lib/remoting-1.396.jar
 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.396.jar
 40272 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 clean 
install findbugs:findbugs
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   DHIS 2
[INFO]   DHIS API
[INFO]   DHIS Support Parent Project
[INFO]   DHIS Test Support
[INFO]   DHIS External Support
[INFO]   DHIS Hibernate Support
[INFO]   DHIS System Support
[INFO]   DHIS JDBC Service
[INFO]   DHIS XML framework services
[INFO]   DHIS Services Parent Project
[INFO]   DHIS Core API Implementations
[INFO]   DHIS I18n Static
[INFO]   DHIS Options
[INFO]   DHIS Administration Service
[INFO]   DHIS DataMart Service - Default
[INFO]   DHIS Aggregation Service - Default
[INFO]   DHIS OrganisationUnit API Implementations
[INFO]   DHIS Reporting Service
[INFO]   DHIS Import-Export Service
[INFO]   DHIS Patient API Implementations
[INFO]   DHIS JDBC / External Test Project
[INFO] 
[INFO] Building DHIS 2
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
 to 
/ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis/2.2-SNAPSHOT/dhis-2.2-SNAPSHOT.pom
[INFO] Preparing findbugs:findbugs
[INFO] No goals needed for project - skipping
[HUDSON] Archiving 
 to 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Service 
Trunk/modules/org.hisp.dhis$dhis/builds/2011-03-28_11-31-02/archive/org.hisp.dhis/dhis/2.2-SNAPSHOT/pom.xml
[HUDSON] Archiving 
/ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis/2.2-SNAPSHOT/dhis-2.2-SNAPSHOT.pom
 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 
Service 
Trunk/modules/org.hisp.dhis$dhis/builds/2011-03-28_11-31-02/archive/org.hisp.dhis/dhis/2.2-SNAPSHOT/dhis-2.2-SNAPSHOT.pom
[INFO] Setting property: classpath.resource.loader.class => 
'org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader'.
[INFO] Settin

[Dhis2-devs] [Bug 744132] [NEW] Null pointer excepption when using custom data entry forms for Name-Based Data Records

2011-03-28 Thread Bjørnar Valbø
Public bug reported:

Null pointer excepption when using custom data entry forms for Name-
Based Data Records

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744132

Title:
  Null pointer excepption when using custom data entry forms for Name-
  Based Data Records

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Null pointer excepption when using custom data entry forms for Name-
  Based Data Records

___
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 744130] [NEW] NBITS: Clumsy warning message

2011-03-28 Thread Bjørnar Valbø
Public bug reported:

When Date of incident > Date of Enrollment when enrolling a Patient in a
Program, the warning message says:

"Date of Enrollment is greater and equals to Date of incident."

I guess it should say "should be greater" instead of "is greater"...

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744130

Title:
  NBITS: Clumsy warning message

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  When Date of incident > Date of Enrollment when enrolling a Patient in
  a Program, the warning message says:

  "Date of Enrollment is greater and equals to Date of incident."

  I guess it should say "should be greater" instead of "is greater"...

___
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 744127] [NEW] NBITS: Missing translations

2011-03-28 Thread Bjørnar Valbø
Public bug reported:

Some translations are missing:

Beneficiary management:
 - manage_program_unenrollment

Name-based data records data entry for a beneficiary - info box:
 - dob_type
 - blood_group

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744127

Title:
  NBITS: Missing translations

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Some translations are missing:

  Beneficiary management:
   - manage_program_unenrollment

  Name-based data records data entry for a beneficiary - info box:
   - dob_type
   - blood_group

___
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 744125] [NEW] Beneficiary attributes cannot be deleted

2011-03-28 Thread Bjørnar Valbø
Public bug reported:

Cannot delete beneficiary attribute because they're associated with
patients:


* INFO  10:25:56,474 Deleted objects associatied with object of type 
PatientAttribute (DefaultDeletionManager.java [http-8080-1])
* WARN  10:25:56,483 SQL Error: 0, SQLState: 23503 (JDBCExceptionReporter.java 
[http-8080-1])
* ERROR 10:25:56,485 Batch entry 0 delete from patientattribute where 
patientattributeid='21021' was aborted.  Call 

getNextException to see the cause. (JDBCExceptionReporter.java [http-8080-1])
* WARN  10:25:56,486 SQL Error: 0, SQLState: 23503 (JDBCExceptionReporter.java 
[http-8080-1])
* ERROR 10:25:56,488 ERROR: update or delete on table "patientattribute" 
violates foreign key constraint 

"fk_patient_patientattributeid" on table "patient_attributes"
  Detail: Key (patientattributeid)=(21021) is still referenced from table 
"patient_attributes". (JDBCExceptionReporter.java [http-

8080-1])
* ERROR 10:25:56,490 Could not synchronize database state with session 
(AbstractFlushingEventListener.java [http-8080-1])
org.hibernate.exception.ConstraintViolationException: Could not execute JDBC 
batch update

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744125

Title:
  Beneficiary attributes cannot be deleted

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Cannot delete beneficiary attribute because they're associated with
  patients:

  
  * INFO  10:25:56,474 Deleted objects associatied with object of type 
PatientAttribute (DefaultDeletionManager.java [http-8080-1])
  * WARN  10:25:56,483 SQL Error: 0, SQLState: 23503 
(JDBCExceptionReporter.java [http-8080-1])
  * ERROR 10:25:56,485 Batch entry 0 delete from patientattribute where 
patientattributeid='21021' was aborted.  Call 

  getNextException to see the cause. (JDBCExceptionReporter.java [http-8080-1])
  * WARN  10:25:56,486 SQL Error: 0, SQLState: 23503 
(JDBCExceptionReporter.java [http-8080-1])
  * ERROR 10:25:56,488 ERROR: update or delete on table "patientattribute" 
violates foreign key constraint 

  "fk_patient_patientattributeid" on table "patient_attributes"
Detail: Key (patientattributeid)=(21021) is still referenced from table 
"patient_attributes". (JDBCExceptionReporter.java [http-

  8080-1])
  * ERROR 10:25:56,490 Could not synchronize database state with session 
(AbstractFlushingEventListener.java [http-8080-1])
  org.hibernate.exception.ConstraintViolationException: Could not execute JDBC 
batch update

___
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 744124] [NEW] Non-informative text after beneficiary registration

2011-03-28 Thread Bjørnar Valbø
Public bug reported:

After a new beneficiary is registered, the cinfirmation page says:

Full Name:  $encoder.htmlEncode( $patient.getFullName() )
Gender: $encoder.htmlEncode( $patient.gender )
Date of Birth:  $format.formatDate( $patient.birthDate )
Age:$encoder.htmlEncode( $patient.getAge() )

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744124

Title:
  Non-informative text after beneficiary registration

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  After a new beneficiary is registered, the cinfirmation page says:

  Full Name:$encoder.htmlEncode( $patient.getFullName() )
  Gender:   $encoder.htmlEncode( $patient.gender )
  Date of Birth:$format.formatDate( $patient.birthDate )
  Age:  $encoder.htmlEncode( $patient.getAge() )

___
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 744123] [NEW] NBITS: Calendar doesn't support dates earlier than2000

2011-03-28 Thread Bjørnar Valbø
Public bug reported:

Cannot choose a date that is earlier than jan 1st 2000 from the
calendars in the NBITS module

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744123

Title:
  NBITS: Calendar doesn't support dates earlier than2000

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Cannot choose a date that is earlier than jan 1st 2000 from the
  calendars in the NBITS module

___
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 744097] [NEW] Don't add duplicate identifier

2011-03-28 Thread Thu Tran
Public bug reported:

Currently, we can add duplicate identifier and there is no validation to
verify the same.

** Affects: dhis2
 Importance: Undecided
 Assignee: Thu Tran (tran-hispvietnam)
 Status: New

** 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/744097

Title:
  Don't add duplicate identifier

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Currently, we can add duplicate identifier and there is no validation
  to verify the same.

___
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 3181: Fix bug: Calendar doesn't support dates earlier than 2000 in NBITS.

2011-03-28 Thread noreply

revno: 3181
committer: Tran Chau 
branch nick: dhis2
timestamp: Mon 2011-03-28 17:32:09 +0700
message:
  Fix bug: Calendar doesn't support dates earlier than 2000 in NBITS.
modified:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.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/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	2011-03-28 09:08:01 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2011-03-28 10:32:09 +
@@ -290,3 +290,4 @@
 please_specify_an_orgunit		= Please specify an organisation unit
 please_select_to_date_greater_or_equals_to_from_date			= Please select to-date greater or equals to from-date
 violate_validation= Violate validation
+common_info		= Common information

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-03-24 13:43:29 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-03-28 10:32:09 +
@@ -871,7 +871,7 @@
 		buttonImage: '../images/calendar.png',
 		buttonImageOnly: true,
 		constrainInput: true,
-yearRange: '-11'
+yearRange: '-100:+100'
 	});
 	s = jQuery("#" + id );		
 	if( s.val()=='' ) s.val( getCurrentDate() );		
@@ -890,7 +890,7 @@
 		buttonImage: '../images/calendar.png',
 		buttonImageOnly: true,
 		constrainInput: true,
-yearRange: '-11'
+yearRange: '-100:+100'
 	});
 	
 	if( today == undefined ) today = false;
@@ -914,7 +914,7 @@
 		buttonImage: '../images/calendar.png',
 		buttonImageOnly: true,
 		constrainInput: true,
-yearRange: '-11'
+yearRange: '-100:+100'
 	});
 		
 }
@@ -939,7 +939,7 @@
 		buttonImageOnly: true,
 		maxDate: '+0d +0w',
 		constrainInput: true,
-yearRange: '-11'
+yearRange: '-100:+100'
 	});
 	
 	if( today == undefined ) today = false;
@@ -983,7 +983,7 @@
 		buttonImage: '../images/calendar.png',
 		buttonImageOnly: true,
 		constrainInput: true,
-yearRange: '-11',
+yearRange: '-100:+100',
 		onSelect: function(selectedDate)
 		{
 			var option = this.id == startdate ? "minDate" : "maxDate";

___
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 744166] [NEW] Get compulsory orgunit group set occurs NPE

2011-03-28 Thread Hieu Duy Dang
Public bug reported:

After organization unit added then I got a null pointer exception (NPE)
in getting the compulsory organization unit group set. I found out the
problem is in the id of new added unit could not be chained to next
action. Guess that this problem by strust.

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744166

Title:
  Get compulsory orgunit group set occurs NPE

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  After organization unit added then I got a null pointer exception
  (NPE) in getting the compulsory organization unit group set. I found
  out the problem is in the id of new added unit could not be chained to
  next action. Guess that this problem by strust.

___
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 744166] Re: Get compulsory orgunit group set occurs NPE

2011-03-28 Thread Hieu Duy Dang
Test with latest code and an empty database.

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744166

Title:
  Get compulsory orgunit group set occurs NPE

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  After organization unit added then I got a null pointer exception
  (NPE) in getting the compulsory organization unit group set. I found
  out the problem is in the id of new added unit could not be chained to
  next action. Guess that this problem by strust.

___
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 744124] Re: Non-informative text after beneficiary registration

2011-03-28 Thread Thu Tran
** 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/744124

Title:
  Non-informative text after beneficiary registration

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  After a new beneficiary is registered, the cinfirmation page says:

  Full Name:$encoder.htmlEncode( $patient.getFullName() )
  Gender:   $encoder.htmlEncode( $patient.gender )
  Date of Birth:$format.formatDate( $patient.birthDate )
  Age:  $encoder.htmlEncode( $patient.getAge() )

___
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 744123] Re: NBITS: Calendar doesn't support dates earlier than2000

2011-03-28 Thread Thu Tran
** Changed in: dhis2
 Assignee: (unassigned) => Thu Tran (tran-hispvietnam)

** 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/744123

Title:
  NBITS: Calendar doesn't support dates earlier than2000

Status in DHIS 2 - District Health Information Software:
  Fix Committed

Bug description:
  Cannot choose a date that is earlier than jan 1st 2000 from the
  calendars in the NBITS module

___
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] Jenkins build is back to normal : Dhis2 Service Trunk » DHIS API #2351

2011-03-28 Thread support
See 




___
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] Jenkins build is back to normal : Dhis2 Service Trunk #2351

2011-03-28 Thread support
See 



___
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 3182: Removed unused dirs

2011-03-28 Thread noreply

revno: 3182
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2011-03-28 13:59:00 +0200
message:
  Removed unused dirs
removed:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/WEB-INF/lib/
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/WEB-INF/lib/


--
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
=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/WEB-INF/lib'
=== removed directory 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/WEB-INF/lib'
___
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 744205] [NEW] Edit compulsory data elements crashing

2011-03-28 Thread Ifeanyi Okoye
Public bug reported:

Program crashes once I click on 'edit compulsory data elements"

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744205

Title:
  Edit compulsory data elements crashing

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Program crashes once I click on 'edit compulsory data elements"

___
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 744205] Re: Edit compulsory data elements crashing

2011-03-28 Thread Ifeanyi Okoye
** Attachment added: "Error DHIS.htm"
   
https://bugs.launchpad.net/bugs/744205/+attachment/1949569/+files/Error%20DHIS.htm

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744205

Title:
  Edit compulsory data elements crashing

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Program crashes once I click on 'edit compulsory data elements"

___
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] Proposal to move a few modules

2011-03-28 Thread Jason Pickering
Hi Devs,
I would like to suggest that a few modules be moved around.



1) That the "Scheduling management" be moved to the Maintenance
module. It seems more like an administrative function.
2) That the "Data browser" module be moved from the Maintenance module
to the reporting module. It seems more like a reporting function now,
than an administrative one.


Regards,
Jason


-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+260974901293

___
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 744246] [NEW] Can't uncheck 'calculated' once data element designated as calculated

2011-03-28 Thread Ifeanyi Okoye
Public bug reported:

I created as calculated data element using 2 other data elements. I
tried to delete the data element but it would not delete. I edited and
then removed the 2 data elements but the 'Calculated' check box remained
greyed out and so could not uncheck. Data element will not save and
still cannot be deleted. Attempt to delete does not give any error
message, it just does not delete. There should be some error message
stating why the data element could not be deleted

** Affects: dhis2
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744246

Title:
  Can't uncheck 'calculated' once data element designated as calculated

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  I created as calculated data element using 2 other data elements. I
  tried to delete the data element but it would not delete. I edited and
  then removed the 2 data elements but the 'Calculated' check box
  remained greyed out and so could not uncheck. Data element will not
  save and still cannot be deleted. Attempt to delete does not give any
  error message, it just does not delete. There should be some error
  message stating why the data element could not be deleted

___
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 744205] Re: Edit compulsory data elements crashing

2011-03-28 Thread jason.p.pickering
*** This bug is a duplicate of bug 704857 ***
https://bugs.launchpad.net/bugs/704857

This is actually an upstream bug, which needs to be fixed, to test for
the existence of the resource tables.

** This bug has been marked a duplicate of bug 704857
   Nullpointer on updating data element with calculated elements
 * You can subscribe to bug 704857 by following this link: 
https://bugs.launchpad.net/dhis2/+bug/704857/+subscribe

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744205

Title:
  Edit compulsory data elements crashing

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Program crashes once I click on 'edit compulsory data elements"

___
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] [Bug 744205] Re: Edit compulsory data elements crashing

2011-03-28 Thread jason.p.pickering
*** This bug is a duplicate of bug 704857 ***
https://bugs.launchpad.net/bugs/704857

Hi Ifeanyi,
This seems to be because you have yet to build the resource tables.

Go to Maintenance->Resource Tables.

I would recommended that you generate all of the tables.

Regards,
Jason


On Mon, Mar 28, 2011 at 1:32 PM, Ifeanyi Okoye
<744...@bugs.launchpad.net> wrote:
> ** Attachment added: "Error DHIS.htm"
>   
> https://bugs.launchpad.net/bugs/744205/+attachment/1949569/+files/Error%20DHIS.htm
>
> --
> You received this bug notification because you are a member of DHIS 2
> India Developers, which is subscribed to DHIS.
> https://bugs.launchpad.net/bugs/744205
>
> Title:
>  Edit compulsory data elements crashing
>
> Status in DHIS 2 - District Health Information Software:
>  New
>
> Bug description:
>  Program crashes once I click on 'edit compulsory data elements"
>


-- 
Jason P. Pickering
email: jason.p.picker...@gmail.com
tel:+260974901293

-- 
You received this bug notification because you are a member of DHIS 2
developers, which is subscribed to DHIS.
https://bugs.launchpad.net/bugs/744205

Title:
  Edit compulsory data elements crashing

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Program crashes once I click on 'edit compulsory data elements"

___
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] Proposal to move a few modules

2011-03-28 Thread Saptarshi Purkayastha
I agree on both of those...

---
Regards,
Saptarshi PURKAYASTHA

My Tech Blog:  http://sunnytalkstech.blogspot.com
You Live by CHOICE, Not by CHANCE


On 28 March 2011 14:53, Jason Pickering  wrote:

> Hi Devs,
> I would like to suggest that a few modules be moved around.
>
>
>
> 1) That the "Scheduling management" be moved to the Maintenance
> module. It seems more like an administrative function.
> 2) That the "Data browser" module be moved from the Maintenance module
> to the reporting module. It seems more like a reporting function now,
> than an administrative one.
>
>
> Regards,
> Jason
>
>
> --
> Jason P. Pickering
> email: jason.p.picker...@gmail.com
> tel:+260974901293
>
> ___
> 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 3183: (GIS) Refresh and clear layer buttons implemented.

2011-03-28 Thread noreply
Merge authors:
  Jan Henrik Øverland (janhenrik-overland)

revno: 3183 [merge]
committer: Jan Henrik Overland 
branch nick: dhis2
timestamp: Mon 2011-03-28 15:32:54 +0200
message:
  (GIS) Refresh and clear layer buttons implemented.
modified:
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.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/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-25 13:46:01 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-25 13:59:06 +
@@ -33,14 +33,11 @@
 	background-color:#F8F8F8;
 }
 .x-tree-node-leaf .x-tree-node-icon {
-background-image:url('../../resources/ext-ux/theme/gray-extend-ux/leaf.gif');
-background-position:center center;
+background:url('../../resources/ext-ux/theme/gray-extend-ux/leaf.gif') center center;
 padding-right:1px;
 }
 #layertree_tp .x-tree-node-leaf .x-tree-node-icon {
-background-image:url('../../../images/settings_small.png');
-background-position:center 4px;
-padding-right:0px;
+background:url('../../../images/settings_small.png') center center no-repeat;
 }
 .x-btn-tl, .x-btn-tr, .x-btn-tc, .x-btn-ml, .x-btn-mr, .x-btn-mc, .x-btn-bl, .x-btn-br, .x-btn-bc {
 	background-image:url('../../resources/ext-ux/theme/gray-extend-ux/btn.gif');

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-03-25 10:22:40 +
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-03-28 12:02:08 +
@@ -508,13 +508,13 @@
 	}
 
 if (G.vars.activePanel.isPolygon()) {
-if (!choropleth.formValidation.validateForm(true)) {
+if (!choropleth.formValidation.validateForm.apply(choropleth, [true])) {
 return;
 }
 params = choropleth.formValues.getAllValues.call(choropleth);
 }
 else if (G.vars.activePanel.isPoint()) {
-if (!symbol.formValidation.validateForm(true)) {
+if (!symbol.formValidation.validateForm.apply(symbol, [true])) {
 return;
 }
 params = symbol.formValues.getAllValues.call(symbol);
@@ -709,8 +709,8 @@
 var values, svg;
 
 if (polygonLayer.visibility && pointLayer.visibility) {
-if (choropleth.formValidation.validateForm()) {
-if (symbol.formValidation.validateForm()) {
+if (choropleth.formValidation.validateForm.call(choropleth)) {
+if (symbol.formValidation.validateForm.call(symbol)) {
 document.getElementById('layerField').value = 3;
 document.getElementById('imageLegendRowsField').value = choropleth.imageLegend.length;
 
@@ -739,7 +739,7 @@
 }
 }
 else if (polygonLayer.visibility) {
-if (choropleth.formValidation.validateForm()) {
+if (choropleth.formValidation.validateForm.call(choropleth)) {
 values = choropleth.formValues.getImageExportValues.call(choropleth);
 document.getElementById('layerField').value = 1;
 document.getElementById('periodField').value = values.dateValue;
@@ -753,7 +753,7 @@
 }
 }
 else if (pointLayer.visibility) {
-if (symbol.formValidation.validateForm()) {
+if (symbol.formValidation.validateForm.call(symbol)) {
 values = symbol.formValues.getImageExportV

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 3184: Cleanup

2011-03-28 Thread noreply

revno: 3184
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2011-03-28 15:52:32 +0200
message:
  Cleanup
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/lists.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-03-28 10:32:09 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-03-28 13:52:32 +
@@ -231,6 +231,7 @@
 		item.disabled = true;
 	});
 }
+
 /**
  * Enables the element with the given identifier if the element exists in parent
  * window of frame.
@@ -851,7 +852,6 @@
 }
 }
 
-
 /**
  * Create jQuery datepicker for input text with id * *
  * 
@@ -958,7 +958,6 @@
  * @param enddate
  *the id of input field which you want enter end date *
  */
-
 function datePickerInRange ( startdate, enddate, setCurrentStartDate, setCurrentEndDate )
 {
 	if( setCurrentStartDate == undefined ) setCurrentStartDate = true;
@@ -1074,15 +1073,13 @@
 	setCaretToPos( inputArea, inputArea.value.length );
 }
 
-// ==
-// FORM VALIDATION
-// ==
+// -
+// Form validation
+// -
 
 /**
  * Create validator for fileds in form *
- */
-
-/*
+ *
  * this should replace validation() at some point, but theres just to much code
  * depending on the old version for now.
  * 
@@ -1116,7 +1113,7 @@
 	return validator;	
 }
 
-/*
+/**
  * @return A dictionary containing the default validation rules.
  */
 function getValidationRules() {
@@ -1236,9 +1233,9 @@
 	});
 }
 
-// ==
-// MESSAGE
-// ==
+// -
+// Message
+// -
 
 /**
  * Show message at the top-right of screen, this message will hide automatic
@@ -1308,10 +1305,9 @@
 	return  next.length > 0 ;
 }
 
-
-// =
-// GUI
-// =
+// -
+// GUI operations
+// -
 
 /**
  * Clock screen by mask *
@@ -1374,6 +1370,7 @@
 	hideById( id );
 	unLockScreen();
 }
+
 /**
  * Removes the opacity div from the document. function deleteDivEffect()
  */
@@ -1387,7 +1384,7 @@
 	}
 }
 
-/*
+/**
  * Paging
  */
 function changePageSize( baseLink )
@@ -1427,6 +1424,26 @@
 	}
 }
 
+function relativePeriodsChecked()
+{
+if ( isChecked( "reportingMonth" ) == true ||
+ isChecked( "monthsThisYear" ) == true ||
+ isChecked( "quartersThisYear" ) == true ||
+ isChecked( "thisYear" ) == true ||
+ isChecked( "monthsLastYear" ) == true ||
+ isChecked( "quartersLastYear" ) == true ||
+ isChecked( "lastYear" ) == true )
+{
+return true;
+}
+
+return false;
+}
+
+// -
+// Math methods
+// -
+
 function isNumber( value )
 {
 	var regex = /^[+-]?\d+(\.\d+)?([eE][+-]?\d+)?$/;
@@ -1458,19 +1475,3 @@
 {
 	return Math.floor( 100 * Math.random() );
 }
-
-function relativePeriodsChecked()
-{
-if ( isChecked( "reportingMonth" ) == true ||
- isChecked( "monthsThisYear" ) == true ||
- isChecked( "quartersThisYear" ) == true ||
- isChecked( "thisYear" ) == true ||
- isChecked( "monthsLastYear" ) == true ||
- isChecked( "quartersLastYear" ) == true ||
- isChecked( "lastYear" ) == true )
-{
-return true;
-}
-
-return false;
-}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/lists.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 3185: Cleanup

2011-03-28 Thread noreply

revno: 3185
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2011-03-28 16:15:48 +0200
message:
  Cleanup
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.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-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2011-01-20 23:05:28 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2011-03-28 14:15:48 +
@@ -141,13 +141,13 @@
 
 div#orgUnitTree 
 {
-  font-size: 9pt; /* <-- Size to change */
+  font-size: 9pt; /* Size to change */
   padding-top: 4px;
 }
 
 #leftBarContents div#orgUnitTree 
 {
-  font-size: 9pt; /* <-- Size to change */
+  font-size: 9pt; /* Size to change */
   background-color: white;
   overflow: auto;
   width: 233px;
@@ -215,7 +215,7 @@
 
 div#selectionTree 
 {
-  font-size: 9pt; /* <-- Size to change */
+  font-size: 9pt; /* Size to change */
   background-color: white;
   height: 300px;
   width:595px;  
@@ -242,7 +242,7 @@
 div#selectionTree span.toggle 
 {
   font-family: courier new, monospace;
-  font-size: 9pt; /* <-- Size to change */
+  font-size: 9pt; /* Size to change */
   cursor: pointer;
 }
 
@@ -343,320 +343,6 @@
 }
 
 /**/
-/* The main calendar widget. Div containing a table.  */
-/**/
-
-.calendar 
-{
-  position: relative;
-  display: none;
-  border-top: 2px solid #fff;
-  border-right: 2px solid #000;
-  border-bottom: 2px solid #000;
-  border-left: 2px solid #fff;
-  font-size: 11px;
-  color: #000;
-  cursor: default;
-  background: #c8d0d4;
-  font-family: tahoma, verdana, sans-serif;
-  z-index: 9;
-}
-
-.calendar table 
-{
-  border-top: 1px solid #000;
-  border-right: 1px solid #fff;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #000;
-  font-size: 11px;
-  color: #000;
-  cursor: default;
-  background: #c8d0d4;
-  font-family: tahoma, verdana, sans-serif;
-  z-index: 9;
-}
-
-/* Header part -- contains navigation buttons and day names. */
-.calendar .button 
-{ 
-  text-align: center;
-  padding: 1px;
-  border-top: 1px solid #fff;
-  border-right: 1px solid #000;
-  border-bottom: 1px solid #000;
-  border-left: 1px solid #fff;
-}
-
-.calendar .nav 
-{
-  background: transparent url(menuarrow.gif) no-repeat 100% 100%;
-}
-
-.calendar thead .title 
-{ /* This holds the current "month, year" */
-  font-weight: bold;
-  padding: 1px;
-  border: 1px solid #000;
-  background: #788084;
-  color: #fff;
-  text-align: center;
-}
-
-.calendar thead .headrow 
-{ /* Row  containing navigation buttons */
-  
-}
-
-.calendar thead .daynames 
-{ /* Row  containing the day names */
-  
-}
-
-.calendar thead .name 
-{ /* Cells  containing the day names */
-  border-bottom: 1px solid #000;
-  padding: 2px;
-  text-align: center;
-  background: #e8f0f4;
-}
-
-.calendar thead .weekend 
-{ /* How a weekend day name shows in header */
-  color: #f00;
-}
-
-.calendar thead .hilite 
-{
-  /* How do the buttons in header appear when hover */
-  border-top: 2px solid #fff;
-  border-right: 2px solid #000;
-  border-bottom: 2px solid #000;
-  border-left: 2px solid #fff;
-  padding: 0px;
-  background-color: #d8e0e4;
-}
-
-.calendar thead .active 
-{ /* Active (pressed) buttons in header */
-  padding: 2px 0px 0px 2px;
-  border-top: 1px solid #000;
-  border-right: 1px solid #fff;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #000;
-  background-color: #b8c0c4;
-}
-
-/* The body part -- contains all the days in month. */
-.calendar tbody .day 
-{ /* Cells  containing month days dates */
-  width: 2em;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
-}
-
-.calendar tbody .day .othermonth 
-{
-  font-size: 80%;
-  color: #aaa;
-}
-
-.calendar tbody .day .othermonth .oweekend 
-{
-  color: #faa;
-}
-
-.calendar table .wn 
-{
-  padding: 2px 3px 2px 2px;
-  border-right: 1px solid #000;
-  background: #e8f4f0;
-}
-
-.calendar tbody .rowhilite td 
-{
-  background: #d8e4e0;
-}
-
-.calendar tbody .rowhilite td.wn 
-{
-  background: #c8d4d0;
-}
-
-.calendar tbody td.hilite 
-{ /* Hovered cells  */
-  padding: 1px 3px 1px 1px;
-  border: 1px solid;
-  border-color: #fff #000 #000 #fff;
-}
-
-.calendar tbody td.active 
-{ /* Active (pressed) cells  */
-  padding: 2px 2px 0px 2px;
-  border: 1px solid;
-  border-color: #000 #fff #fff #000;
-}
-
-.calendar tbody td.selected 
-{ /* Cell s

[Dhis2-devs] Build failed in Jenkins: Dhis2 Service Trunk » DHIS API #2354

2011-03-28 Thread support
See 


--
[INFO] 
[INFO] Building DHIS API
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 330 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Compiling 18 source files to 

[INFO] [surefire:test {execution: default-test}]
[INFO] Surefire report directory: 


---
 T E S T S
---
Running org.hisp.dhis.period.YearlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.184 sec
Running org.hisp.dhis.period.SixMonthlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.112 sec
Running org.hisp.dhis.period.RelativePeriodTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.083 sec
Running org.hisp.dhis.dataelement.OperandTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 sec
Running org.hisp.dhis.organisationunit.OrganisationUnitTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.071 sec
Running org.hisp.dhis.period.FinancialAprilPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.091 sec
Running org.hisp.dhis.common.CombinationGeneratorTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 sec
Running org.hisp.dhis.patient.PatientTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec
Running org.hisp.dhis.period.QuarterlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec
Running org.hisp.dhis.dataelement.DataElementTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.058 sec
Running org.hisp.dhis.organisationunit.OrganisationUnitHierarchyTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec
Running org.hisp.dhis.period.MonthlyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 sec
Running org.hisp.dhis.period.FinancialOctoberPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 sec
Running org.hisp.dhis.dataentryform.DataEntryFormTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.021 sec
Running org.hisp.dhis.period.WeeklyPeriodTypeTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 0.019 sec
Running org.hisp.dhis.period.FinancialJulyPeriodTypeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.035 sec
Running org.hisp.dhis.period.StringFormatTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.036 sec

Results :

Tests run: 52, Failures: 0, Errors: 0, Skipped: 2

[HUDSON] Recording test results
FATAL: Failed to save the JUnit test result
java.io.IOException: Disk quota exceeded
at java.io.FileOutputStream.close0(Native Method)
at java.io.FileOutputStream.close(FileOutputStream.java:279)
at sun.nio.cs.StreamEncoder.implClose(StreamEncoder.java:301)
at sun.nio.cs.StreamEncoder.close(StreamEncoder.java:130)
at java.io.OutputStreamWriter.close(OutputStreamWriter.java:216)
at java.io.BufferedWriter.close(BufferedWriter.java:248)
at hudson.util.AtomicFileWriter.close(AtomicFileWriter.java:94)
at hudson.util.AtomicFileWriter.commit(AtomicFileWriter.java:109)
at hudson.XmlFile.write(XmlFile.java:166)
at 
hudson.tasks.junit.TestResultAction.setResult(TestResultAction.java:82)
at hudson.tasks.junit.TestResultAction.(TestResultAction.java:67)
at hudson.maven.reporters.SurefireReport.(SurefireReport.java:45)
at 
hudson.maven.reporters.SurefireArchiver$1.call(SurefireArchiver.java:132)
at 
hudson.maven.reporters.SurefireArchiver$1.call(SurefireArchiver.java:128)
at hudson.maven.MavenBuild$ProxyImpl.execute(MavenBuild.java:379)
at hudson.maven.MavenBuild$ProxyImpl2.execute(MavenBuild.java:452)
at sun.reflect.GeneratedMet

[Dhis2-devs] Build failed in Jenkins: Dhis2 Service Trunk #2354

2011-03-28 Thread support
See 

Changes:

[Lars Helge Overland] Cleanup

--
[...truncated 2 lines...]
info result: bzr revision-info -d 
 returned 0. Command 
output: "3184 larshe...@gmail.com-20110328135232-sd47dv0x1rgibusp
" stderr: ""
[workspace] $ bzr pull --overwrite 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
 M  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
All changes applied successfully.
Now on revision 3185.
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3185 larshe...@gmail.com-20110328141548-zo3d8e7jkk424xzt
" stderr: ""
[workspace] $ bzr log -v -r 
revid:larshe...@gmail.com-20110328135232-sd47dv0x1rgibusp..revid:larshe...@gmail.com-20110328141548-zo3d8e7jkk424xzt
 --long --show-ids
Getting local revision...
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3185 larshe...@gmail.com-20110328141548-zo3d8e7jkk424xzt
" stderr: ""
RevisionState revno:3185 
revid:larshe...@gmail.com-20110328141548-zo3d8e7jkk424xzt
Found mavenVersion 2.2.1 from file 
jar:file:/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1/lib/maven-2.2.1-uber.jar!/META-INF/maven/org.apache.maven/maven-core/pom.properties
Parsing POMs
[dhis-2] $ /local/opt/j2sdk/bin/java -Xmx2048m -XX:MaxPermSize=512m -cp 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven-agent-1.396.jar:/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1/boot/classworlds-1.1.jar
 hudson.maven.agent.Main 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/tools/2.2.1 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/tomcat/webapps/ci/WEB-INF/lib/remoting-1.396.jar
 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven-interceptor-1.396.jar
 56829 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/plugins/maven-plugin/WEB-INF/lib/maven2.1-interceptor-1.2.jar
<===[HUDSON REMOTING CAPACITY]===>   channel started
Executing Maven:  -B -f 
 clean 
install findbugs:findbugs
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   DHIS 2
[INFO]   DHIS API
[INFO]   DHIS Support Parent Project
[INFO]   DHIS Test Support
[INFO]   DHIS External Support
[INFO]   DHIS Hibernate Support
[INFO]   DHIS System Support
[INFO]   DHIS JDBC Service
[INFO]   DHIS XML framework services
[INFO]   DHIS Services Parent Project
[INFO]   DHIS Core API Implementations
[INFO]   DHIS I18n Static
[INFO]   DHIS Options
[INFO]   DHIS Administration Service
[INFO]   DHIS DataMart Service - Default
[INFO]   DHIS Aggregation Service - Default
[INFO]   DHIS OrganisationUnit API Implementations
[INFO]   DHIS Reporting Service
[INFO]   DHIS Import-Export Service
[INFO]   DHIS Patient API Implementations
[INFO]   DHIS JDBC / External Test Project
[INFO] 
[INFO] Building DHIS 2
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
 to 
/ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis/2.2-SNAPSHOT/dhis-2.2-SNAPSHOT.pom
[INFO] Preparing findbugs:findbugs
[INFO] No goals needed for project - skipping
[INFO] Setting property: classpath.resource.loader.class => 
'org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader'.
[INFO] Setting property: velocimacro.messages.on => 'false'.
[INFO] Setting property: resource.loader => 'classpath'.
[INFO] Setting property: resource.manager.logwhenfound => 'false'.
[INFO] ** 
[INFO] Starting Jakarta Velocity v1.4
[INFO] RuntimeInstance initializing.
[INFO] Default Properties File: 
org/apache/velocity/runtime/defaults/velocity.properties
[INFO] Default ResourceManager initializing. (class 
org.apache.velocity.runtime.resource.ResourceManagerImpl)
[INFO] Resource Loader Instantiated: 
org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader
[INFO] ClasspathResourceLoader : initialization starting.
[INFO] ClasspathResourceLoader : initialization complete.
[INFO] ResourceCache : initialized. (class 
org.apache.velocity.runtime.resource.ResourceCacheImpl)
[INFO] Default Resou

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 3188: Whole top menu link can be hovered to make menu appear

2011-03-28 Thread noreply

revno: 3188
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2011-03-28 16:43:01 +0200
message:
  Whole top menu link can be hovered to make menu appear
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.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-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-03-24 10:38:51 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-03-28 14:43:01 +
@@ -101,35 +101,31 @@
   color: #ff;
   font-weight: bold;
   text-align: center;
-  line-height: 44px;
+  line-height: 58px;
   cursor: pointer;
 }
 
 div#menuLink1
 {
   position: absolute;
-  top: 7px;
   left: 582px;
 }
 
 div#menuLink2
 {
   position: absolute;
-  top: 7px;
   left: 682px;
 }
 
 div#menuLink3
 {
   position: absolute;
-  top: 7px;
   left: 782px;
 }
 
 div#menuLink4
 {
   position: absolute;
-  top: 7px;
   left: 882px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2011-03-28 14:15:48 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css	2011-03-28 14:43:01 +
@@ -315,22 +315,14 @@
   padding: 0.5em;
 }
 
-div#headerMessageContainer
-{
-  position: fixed;
-  top: 0px;
-  width: 100%;
-  height: 26px;
-  z-index: 20;
-}
-
 div#headerMessage
 {
+  top: 0px;
+  left: 180px;
+  position: fixed;
   display: none;
   height: 26px;
-  width: 560px;
-  margin-left: auto;
-  margin-right: auto;
+  width: 380px;
   background-color: #bf;
   border-right: 1px solid #00;
   border-bottom: 1px solid #00;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2011-03-24 10:14:07 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2011-03-28 14:43:01 +
@@ -91,7 +91,7 @@
 
 
   
-  
+  
   
 
   
@@ -165,9 +165,7 @@
 
 
 
-
-  
-
+
 
 
   #if( !$page )

___
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] Jenkins build is back to normal : Dhis2 Service Trunk » DHIS API #2355

2011-03-28 Thread support
See 




___
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] Jenkins build is back to normal : Dhis2 Service Trunk #2355

2011-03-28 Thread support
See 



___
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 3189: Made top menu slightly smaller

2011-03-28 Thread noreply

revno: 3189
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2011-03-28 17:15:07 +0200
message:
  Made top menu slightly smaller
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-03-28 14:43:01 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-03-28 15:15:07 +
@@ -34,7 +34,7 @@
 {
   background-image: url('logo_background.png');
   background-repeat: repeat-x;
-  height: 59px;
+  height: 47px;
   position: absolute;
   top: 0px;
   left: 0px;
@@ -49,7 +49,7 @@
 img#header2
 {
   position: absolute;
-  top: 1px;
+  top: 0px;
   left: 35px;
 }
 
@@ -101,7 +101,7 @@
   color: #ff;
   font-weight: bold;
   text-align: center;
-  line-height: 58px;
+  line-height: 45px;
   cursor: pointer;
 }
 
@@ -132,11 +132,11 @@
 span#headerText
 {
   position: absolute;
-  top: 19px;
-  left: 228px;
+  top: 13px;
+  left: 235px;
   font-weight: lighter;
   color: white;
-  font-size: 13pt;
+  font-size: 12pt;
 }
 
 div#popupHeader 
@@ -163,21 +163,21 @@
 div#menuDropDown1
 {
   position: absolute;
-  top: 59px;
+  top: 47px;
   left: 580px;
 }
 
 div#menuDropDown2
 {
   position: absolute;
-  top: 59px;
+  top: 47px;
   left: 680px;
 }
 
 div#menuDropDown3
 {
   position: absolute;
-  top: 59px;
+  top: 47px;
   left: 780px;
 }
 
@@ -231,7 +231,7 @@
   width: 235px;
   float: left;
   position: absolute;
-  top: 59px;
+  top: 47px;
   left: 0px;
   padding-top: 6px;
   border-right: 1px solid #10375f;
@@ -361,7 +361,7 @@
 
 #mainPage 
 {
-  margin: 84px 10px 10px 270px;
+  margin: 72px 10px 10px 270px;
 }
 
 #popupPage 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png	2011-03-20 12:12:22 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png	2011-03-28 15:15:07 + differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png	2009-03-03 16:46:36 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png	2011-03-28 15:15:07 + differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png	2011-03-20 12:46:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_left.png	2011-03-28 15:15:07 + differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png	2011-03-20 12:46:00 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_right.png	2011-03-28 15:15:07 + differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png	2011-03-20 12:12:22 + and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png	2011-03-28 15:15:07 + differ
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to 

[Dhis2-devs] SMART Connect vs SMART REST web services

2011-03-28 Thread Knut Staring
Of interest as progress is made on DHIS2 web services.

-- Forwarded message --
From: Ankit Gangal 
Date: Sun, Mar 27, 2011 at 9:09 PM
Subject: [OPENMRS-DEV] [openMRS] project idea gsoc
To: openmrs-deve...@listserv.iupui.edu


Hi Hui Xiao, Josh Mandel, all

I had been looking through the project ideas. I like the idea SMART
Container Module(enabling SMART APPS in OpenMRS)[1] very much. I think that
such an implementation will increase the reach and applicability of openMRS
by heaps and bounds.

I am going though the developers documentation. The basic idea of the
project is to develop a module into a SMART container so that SMART apps
built against the SMART API can be embedded into it.

Regarding the question on implementing SMART REST api, I would like to being
with listing a few pros and cons of both the methods of accessing SMART API



SMART Connect

SMART REST

· SMART Connect is for simple applications whose logic can be
completely built in HTML and JavaScript.





· In case of SMART Connect SMART APP JavaScript Libraries is the
sole access point.







· SMART Connect calls can only access data while the end-user
remains online.

   SMART REST is for applications that may need to perform
significant back-end processing, in particular when using additional
external data sources.



   In case of SMART REST, the library provides the OAuth token
handoff and medical-record context, which app can then send back to its
back-end for use in REST calls.



  If our app needs to access data from our web application's backend
or while the user is offline, we'll need to make some REST calls as well



  Writing a SMART REST app requires a bit more work than a SMART
Connect app

SMART REST is required when we have to do significant back-end processing or
when data has to be accessed while the user is offline. The answer to the
question regarding implementation of SMART REST api depends on whether if
there is a use of such a functionality in OpenMRS or not.

I personally feel that we must go for implementing the REST API as well.
The whole motive behind implementing the SMART module is to increase the
applicability of OpenMRS and if while doing so we do not achieve the maximum
capacity we can get, its just not worth it.

This is what I feel. Please tell me if I am wrong.

I am going through the instructions to build and install SMART apps.
After this I plan to look into how concepts can be mapped into other
technologies.
I request the mentors to give me further directions on the project.

[1]https://wiki.openmrs.org/display/projects/Enabling+SMART+Apps+in+OpenMRS

Regards
Ankit Gangal

--
Click here to 
unsubscribefrom
OpenMRS Developers' mailing list



-- 
Cheers,
Knut Staring
___
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 3190: cleanup, and fixed updateUser validation

2011-03-28 Thread noreply

revno: 3190
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Mon 2011-03-28 17:28:36 +0200
message:
  cleanup, and fixed updateUser validation
modified:
  
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menuWithTreeForDatasetLocks.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/patientDataArchiveForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js	2011-03-24 10:13:34 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js	2011-03-28 15:28:36 +
@@ -10,7 +10,7 @@
 		rawPassword : {
 			required : false,
 			password : true,
-			range : r.user.password.rangelength,
+			rangelength : r.user.password.rangelength,
 			notequalto : '#username'
 		},
 		retypePassword : {
@@ -19,18 +19,18 @@
 		},
 		surname : {
 			required : true,
-			range : r.user.name.rangelength
+			rangelength : r.user.name.rangelength
 		},
 		firstName : {
 			required : true,
-			range : r.user.name.rangelength
+			rangelength : r.user.name.rangelength
 		},
 		email : {
 			email : true,
-			range : r.user.email.rangelength
+			rangelength : r.user.email.rangelength
 		},
 		phoneNumber : {
-			range : r.user.phone.rangelength
+			rangelength : r.user.phone.rangelength
 		}
 	}
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm	2011-03-17 14:42:52 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm	2011-03-28 15:28:36 +
@@ -30,8 +30,10 @@
 		
 		
 			
-			
-		
+			
+
+
+			
 		
 	
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm	2011-03-17 14:42:52 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingForm.vm	2011-03-28 15:28:36 +
@@ -83,7 +83,7 @@
 		
 		
 			
-
+
 #if( $auth.hasAccess( "dhis-web-maintenance-dataadmin", "collectiveDataLockingForUnlocking") )
 	
 #end	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/collectiveDataLockingStatus.vm	2011-03-17 14:42:52 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/s

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 3191: Work in progress

2011-03-28 Thread noreply

revno: 3191
committer: Lars Helge Overland 
branch nick: dhis2
timestamp: Mon 2011-03-28 18:19:29 +0200
message:
  Work in progress
modified:
  
labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java
  
labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java
  labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm
  labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-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 'labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java'
--- labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java	2011-03-24 19:34:13 +
+++ labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetChartAction.java	2011-03-28 16:19:29 +
@@ -114,7 +114,7 @@
 {
 chart = chartService.getJFreeChart( id, format );
 
-height = 200;
+height = 300;
 
 width = 400;
 }

=== modified file 'labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java'
--- labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java	2011-03-24 19:34:13 +
+++ labs/dhis-web-light/src/main/java/org/hisp/dhis/light/action/ProvideContentAction.java	2011-03-28 16:19:29 +
@@ -72,7 +72,6 @@
 if ( config != null )
 {
 ActionContext.getContext().getActionInvocation().getStack().push( config.getAreaItems() );
-System.out.println( config.getAreaItems() );
 }
 
 User user = currentUserService.getCurrentUser();

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm	2011-03-24 19:34:13 +
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm	2011-03-28 16:19:29 +
@@ -8,7 +8,6 @@
   
   
   
-  
   
 
 
@@ -16,30 +15,47 @@
 
 DHIS 2
 
-
-
 
 
+
+
 #if( $chartAreaA )
-
+
 #end
 
 #if( $chartAreaB )
-
+
 #end
 
 #if( $chartAreaC )
-
+
 #end
 
 #if( $chartAreaD )
-
+
 #end
 
+
+
 
 
-
-
-
+Report tables
+
+
+#foreach( $table in $reportTables )
+$encoder.htmlEncode( $table.name )
+#end
+
+
+
+
+Documents
+
+
+#foreach( $doc in $documents )
+$encoder.htmlEncode( $doc.name )
+#end
+
+
 
 

=== modified file 'labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css'
--- labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css	2011-03-24 19:34:13 +
+++ labs/dhis-web-light/src/main/webapp/dhis-web-light/style/dhis-web-light.css	2011-03-28 16:19:29 +
@@ -10,23 +10,35 @@
   
 .headerDiv {
   position: relative;
-  width: 100%;
+  width: 96%;
   font-size: 2em;
-  text-align: center;
   color: #ff;
   background-color: #32669a;
-  padding: 0.5em;
-  border-bottom: 1px solid #d0d0d0;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 4%;
+  border-top: 1px solid #c0c0c0;
+  border-bottom: 1px solid #c0c0c0;
 }
-  
+
 .contentDiv {
   position: relative;
   width: 100%;
 }
-  
+
+.contentChartDiv {
+  margin-top: 1.5em;
+  padding-top: 1.5em;
+  padding-bottom: 1.5em;
+  margin-bottom: 1.5em;
+  border-bottom: 1px solid #c0c0c0;
+}
+
 .contentItemDiv {
-  position: relative;
-  padding-top: 3em;
-  padding-bottom: 3em;
-  border-bottom: 1px solid #d0d0d0;
+  font-size: 1.8em;
+  margin: 1em;
+  padding: 1.5em;
+  border: 1px solid #c0c0c0;
+  background-color: #d0f6d5;
+  cursor: pointer;
 }

___
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] Build failed in Jenkins: Dhis2 Service Trunk #2358

2011-03-28 Thread support
See 

--
Started by an SCM change
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3191 larshe...@gmail.com-20110328161929-2tjq1o561m68qmfy
" stderr: ""
[workspace] $ bzr pull --overwrite 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
+N  dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/sms/
+N  
dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/sms/HibernateSmsInboundStore.java
+N  
dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/sms/SmsService.java
+N  dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/sms/api/
+N  
dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/sms/api/SmsInbound.java
+N  
dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/sms/api/SmsInboundStore.java
+N  dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/sms/
+N  
dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/sms/hibernate/
+N  
dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/sms/hibernate/Sms.hbm.xml
+N  dhis-mobile/dhis-service-mobile/src/test/java/org/
+N  dhis-mobile/dhis-service-mobile/src/test/java/org/hisp/
+N  dhis-mobile/dhis-service-mobile/src/test/java/org/hisp/dhis/
+N  dhis-mobile/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/
+N  
dhis-mobile/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/CompressorTest.java
+N  dhis-mobile/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/sms/
+N  
dhis-mobile/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/sms/HibernateSmsInboundStoreTest.java
+N  dhis-mobile/dhis-web-mobile/src/main/webapp/WEB-INF/classes/
+N  dhis-mobile/dhis-web-mobile/src/main/webapp/WEB-INF/classes/log4j.properties
 M  
dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SMSImportJob.java
-D  
dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/SMSImportSchedule.java
 M  
dhis-mobile/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/api/ReceiveSMS.java
 M  dhis-mobile/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
 M  
dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/ReceiveSMS.hbm.xml
 M  
dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/SendSMS.hbm.xml
 M  
dhis-mobile/dhis-web-mobile/src/main/java/org/hisp/dhis/mobile/action/MobileSettingsAction.java
All changes applied successfully.
Now on revision 3192.
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3192 sun...@gmail.com-20110328163644-l4ajwmhtrzvpit1e
" stderr: ""
[workspace] $ bzr log -v -r 
revid:larshe...@gmail.com-20110328161929-2tjq1o561m68qmfy..revid:sun...@gmail.com-20110328163644-l4ajwmhtrzvpit1e
 --long --show-ids
Getting local revision...
$ bzr revision-info -d "


___
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] Build failed in Jenkins: Dhis2 Web Trunk » DHIS Web API #2276

2011-03-28 Thread support
See 


--
[INFO] 
[INFO] Building DHIS Web API
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 50 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] Compiling 3 source files to 

[INFO] [surefire:test {execution: default-test}]
[INFO] Surefire report directory: 


---
 T E S T S
---
Running org.hisp.dhis.web.api.provider.DataStreamSerializableProviderTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.105 sec
Running org.hisp.dhis.web.api.model.OrgUnitTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec
Running org.hisp.dhis.web.api.model.OrgUnitsTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec

Results :

Tests run: 3, Failures: 0, Errors: 0, Skipped: 0

[HUDSON] Recording test results
[INFO] [war:war {execution: default-war}]
[INFO] Exploding webapp...
[INFO] Assembling webapp dhis-web-api in 

[INFO] Copy webapp webResources to 

[INFO] Building jar: 

[INFO] Expanding: 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/workspace/dhis-2/dhis-web/dhis-web-commons-resources/target/dhis-web-commons-resources-2.2-SNAPSHOT.war
 into 

[INFO] Overlaying 1 war(s).
[INFO] Generating war 

[INFO] Building war: 

[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-api/builds/2011-03-28_18-48-14/archive/org.hisp.dhis/dhis-web-api/2.2-SNAPSHOT/pom.xml
[INFO] 
[ERROR] BUILD ERROR
[INFO] 
[INFO] Error assembling WAR: Problem creating war: Disk quota exceeded

[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 14 minutes 58 seconds
[INFO] Finished at: Mon Mar 28 19:03:19 CEST 2011
[INFO] Final Memory: 207M/496M
[INFO] 
ERROR: Asynchronous execution failure
java.util.concurrent.ExecutionException: java.io.IOException: Disk quota 
exceeded
at hudson.remoting.Channel$2.adapt(Channel.java:662)
at hudson.remoting.Channel$2.adapt(Channel.java:657)
at hudson.remoting.FutureAdapter.get(FutureAdapter.java:55)
at hudson.maven.MavenBuilder.call(MavenBuilder.java:175)
at 
hudson.maven.MavenModuleSetBuild$Builder.call(MavenModuleSetBuild.java:868)
at 
hudson.maven.MavenModuleSetBuild$Builder.call(MavenModuleSetBuild.java:799)
at hudson.remoting.UserRequest.perform(UserRequest.java:114)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:270)
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.Fu

[Dhis2-devs] Build failed in Jenkins: Dhis2 Web Trunk #2276

2011-03-28 Thread support
See 

Changes:

[Saptarshi] Switch to Polling from Callbacks for reading SMS. Saving incoming 
SMS into database

[Lars Helge Overland] Work in progress

--
[...truncated 1070 lines...]
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 38 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] No tests to run.
[HUDSON] Recording test results
[INFO] [war:war {execution: default-war}]
[INFO] Exploding webapp...
[INFO] Assembling webapp dhis-web-caseentry in 

[INFO] Copy webapp webResources to 

[INFO] Building jar: 

[INFO] Expanding: 

 into 

[INFO] Overlaying 1 war(s).








































 

[Dhis2-devs] Jenkins build is back to normal : Dhis2 Service Trunk #2359

2011-03-28 Thread support
See 



___
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] Jenkins build is back to normal : Dhis2 Web Trunk » DHIS Web API #2277

2011-03-28 Thread support
See 




___
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] Jenkins build is back to normal : Dhis2 Web Trunk #2277

2011-03-28 Thread support
See 



___
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 3194: cleanup in dhis-web-reporting

2011-03-28 Thread noreply

revno: 3194
committer: Morten Olav Hansen 
branch nick: dhis2
timestamp: Mon 2011-03-28 22:09:32 +0200
message:
  cleanup in dhis-web-reporting
modified:
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm
  
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTallySheetForm.vm
  
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultDetailsForm.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-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm	2011-03-18 14:45:12 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm	2011-03-28 20:09:32 +
@@ -18,8 +18,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -73,7 +73,6 @@
 
 
 
-
 
 
 #if ( $dimension == "indicator" )
@@ -86,8 +85,8 @@
 
 
 
-
+
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2011-03-18 14:45:12 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2011-03-28 20:09:32 +
@@ -6,8 +6,8 @@
 
 
 	
-		
+		
+		
 		
 			[ $i18n.getString( "select_period_type_all" ) ]
 			#foreach ( $type in $periodTypes )
@@ -28,16 +28,17 @@
 
 
 
-
+
+
+
+
 
 
 
 
 $i18n.getString( "category_y_selected_periods" )
 
+
 
 

@@ -104,15 +105,17 @@
 
 
 
-
+
+
+			
+			
 
 
+
 
 $i18n.getString( "value_x_selected_indicators" )
 
+
 
 
 
@@ -135,6 +138,7 @@
 
 $i18n.getString( "filter_available_organisationunits" ) - $i18n.getString( 'clear' )
 
+
 
 
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm	2010-09-15 12:34:15 +
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm	2011-03-28 20:09:32 +
@@ -25,16 +25,18 @@
 
 
 
-
+
+
+		
+		
+		
 
 
+
 
 $i18n.getString( "category_x_selected_organisationunits" )
 
+
 
 

@@ -57,10 +59,11 @@
 
 $i18n.getString( "filter_available_periods" )
 
+
 
 	
-		
+		
+		
 		
 			[ $i18n.getString( "select_period_type_all" ) ]
 			#foreach ( $type in $periodTypes )
@@ -69,6 +72,7 @@
 		
 	
 
+
 
 


=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm'
--- dhis-2/dhis-web/d

[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 3195: Fix bug: Non-informative text after beneficiary registration.

2011-03-28 Thread noreply

revno: 3195
committer: Tran Chau 
branch nick: dhis2
timestamp: Tue 2011-03-29 09:51:56 +0700
message:
  Fix bug: Non-informative text after beneficiary registration.
modified:
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/AddPatientAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.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-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/AddPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/AddPatientAction.java	2011-03-25 04:52:13 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/AddPatientAction.java	2011-03-29 02:51:56 +
@@ -327,7 +327,7 @@
 // -
 
 id = patientService.createPatient( patient, representativeId, relationshipTypeId, patientAttributeValues );
-
+
 return SUCCESS;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java	2011-03-28 07:46:07 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java	2011-03-29 02:51:56 +
@@ -29,7 +29,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientService;
 import org.hisp.dhis.patient.state.SelectedStateManager;
@@ -76,7 +75,7 @@
 // -
 // Input/Output
 // -
-
+
 private Integer id;
 
 public void setId( Integer id )
@@ -148,7 +147,7 @@
 patient = patientService.getPatient( id );
 }
 
-if ( id == null )
+else if ( id == null )
 {
 patient = selectedStateManager.getSelectedPatient();
 }
@@ -170,7 +169,6 @@
 // -
 
 programs = programService.getPrograms( selectedStateManager.getSelectedOrganisationUnit() );
-//programs = programService.getAllPrograms();
 
 // -
 // Validate selected Program

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2011-03-24 06:04:40 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2011-03-29 02:51:56 +
@@ -399,7 +399,7 @@
 
 		
-			showProgramEnrollmentForm
+			showProgramEnrollmentForm.action?id=${id}
 			
 			F_PATIENT_ADD
 		

___
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 744124] Re: Non-informative text after beneficiary registration

2011-03-28 Thread Thu Tran
** 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/744124

Title:
  Non-informative text after beneficiary registration

Status in DHIS 2 - District Health Information Software:
  Fix Committed

Bug description:
  After a new beneficiary is registered, the cinfirmation page says:

  Full Name:$encoder.htmlEncode( $patient.getFullName() )
  Gender:   $encoder.htmlEncode( $patient.gender )
  Date of Birth:$format.formatDate( $patient.birthDate )
  Age:  $encoder.htmlEncode( $patient.getAge() )

___
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 3196: Fix bug: Missing translations and Clumsy warning message in Patient module.

2011-03-28 Thread noreply

revno: 3196
committer: Tran Chau 
branch nick: dhis2
timestamp: Tue 2011-03-29 10:06:20 +0700
message:
  Fix bug: Missing translations and Clumsy warning message in Patient module.
modified:
  
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties


--
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/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	2011-03-28 10:32:09 +
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2011-03-29 03:06:20 +
@@ -291,3 +291,6 @@
 please_select_to_date_greater_or_equals_to_from_date			= Please select to-date greater or equals to from-date
 violate_validation= Violate validation
 common_info		= Common information
+dob_type		= DOB Type
+blood_group		= Blood group
+

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-03-28 09:08:01 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2011-03-29 03:06:20 +
@@ -399,7 +399,7 @@
 state_format = State Format
 no_of_char = Number of characters
 letter = Letter
-date_of_incident_invalid = Date of Enrollment is greater and equals to Date of incident.
+date_of_incident_invalid = Date of Enrollment should be greater and equals to Date of incident.
 no_min_days_allowed_input_data = Number of min days allowed to input data
 no_max_days_allowed_input_data = Number of max days allowed to input data
 program_attribute = Program Attribute

___
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 744130] Re: NBITS: Clumsy warning message

2011-03-28 Thread Thu Tran
** 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/744130

Title:
  NBITS: Clumsy warning message

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  When Date of incident > Date of Enrollment when enrolling a Patient in
  a Program, the warning message says:

  "Date of Enrollment is greater and equals to Date of incident."

  I guess it should say "should be greater" instead of "is greater"...

___
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 744127] Re: NBITS: Missing translations

2011-03-28 Thread Thu Tran
** 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/744127

Title:
  NBITS: Missing translations

Status in DHIS 2 - District Health Information Software:
  New

Bug description:
  Some translations are missing:

  Beneficiary management:
   - manage_program_unenrollment

  Name-based data records data entry for a beneficiary - info box:
   - dob_type
   - blood_group

___
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] Build failed in Jenkins: Dhis2 Service Trunk #2362

2011-03-28 Thread support
See 

--
Started by an SCM change
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3195 tran.hispviet...@gmail.com-20110329025156-h0v02oitzvfi7hgq
" stderr: ""
[workspace] $ bzr pull --overwrite 
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
bzr: ERROR: [Errno 122] Disk quota exceeded
ERROR: Failed to pull
Getting local revision...
$ bzr revision-info -d "
info result: bzr revision-info -d 
 returned 0. Command 
output: "3195 tran.hispviet...@gmail.com-20110329025156-h0v02oitzvfi7hgq
" stderr: ""
RevisionState revno:3195 
revid:tran.hispviet...@gmail.com-20110329025156-h0v02oitzvfi7hgq


___
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 744127] Re: NBITS: Missing translations

2011-03-28 Thread Thu Tran
** 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/744127

Title:
  NBITS: Missing translations

Status in DHIS 2 - District Health Information Software:
  Fix Committed

Bug description:
  Some translations are missing:

  Beneficiary management:
   - manage_program_unenrollment

  Name-based data records data entry for a beneficiary - info box:
   - dob_type
   - blood_group

___
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] Build failed in Jenkins: Dhis2 Web Trunk » DHIS Web Dashboard Integration module #2279

2011-03-28 Thread support
See 


--
[INFO] 
[INFO] Building DHIS Web Dashboard Integration module
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 9 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] No tests to run.
[HUDSON] Recording test results
[INFO] [war:war {execution: default-war}]
[INFO] Exploding webapp...
[INFO] Assembling webapp dhis-web-dashboard-integration in 

[INFO] Copy webapp webResources to 

[INFO] Building jar: 

[INFO] Expanding: 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/workspace/dhis-2/dhis-web/dhis-web-commons-resources/target/dhis-web-commons-resources-2.2-SNAPSHOT.war
 into 

[INFO] Overlaying 1 war(s).
[INFO] Generating war 

[INFO] Building war: 

[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-dashboard-integration/builds/2011-03-29_05-17-17/archive/org.hisp.dhis/dhis-web-dashboard-integration/2.2-SNAPSHOT/pom.xml
[INFO] 
[ERROR] BUILD ERROR
[INFO] 
[INFO] Error assembling WAR: Problem creating war: Disk quota exceeded

[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 13 minutes 55 seconds
[INFO] Finished at: Tue Mar 29 05:31:19 CEST 2011
[INFO] Final Memory: 185M/443M
[INFO] 


___
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] Build failed in Jenkins: Dhis2 Web Trunk #2279

2011-03-28 Thread support
See 

Changes:

[Tran Chau] Fix bug: Missing translations and Clumsy warning message in Patient 
module.

[Tran Chau] Fix bug: Non-informative text after beneficiary registration.

--
[...truncated 838 lines...]
[INFO]   Using bug exclude filter /tmp/plexus-resources1098292949tmp
[INFO] Printing Errors
[INFO] Printing Missing classes
[INFO] Printing Source Roots
[FINDBUGS] Successfully parsed file 

 of module DHIS Data Mart with 10 warnings.
[INFO] 
[INFO] Building DHIS Validation Rule
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 28 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] No tests to run.
[HUDSON] Recording test results
[INFO] [war:war {execution: default-war}]
[INFO] Exploding webapp...
[INFO] Assembling webapp dhis-web-validationrule in 

[INFO] Copy webapp webResources to 

[INFO] Building jar: 

[INFO] Expanding: 

 into 

[INFO] Overlaying 1 war(s).
[INFO] Generating war 

[INFO] Building war: 

[INFO] [install:install {execution: default-install}]
[INFO] Installing 

 to 
/ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis-web-validationrule/2.2-SNAPSHOT/dhis-web-validationrule-2.2-SNAPSHOT.war
[INFO] Preparing findbugs:findbugs
[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-validationrule/builds/2011-03-29_05-17-17/archive/org.hisp.dhis/dhis-web-validationrule/2.2-SNAPSHOT/pom.xml
[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-validationrule/builds/2011-03-29_05-17-17/archive/org.hisp.dhis/dhis-web-validationrule/2.2-SNAPSHOT/dhis-web-validationrule.war
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[INFO] [findbugs:findbugs {execution: default-cli}]
[INFO]   Using source root:
[INFO] 

[INFO]   Using test source root:
[INFO] 

[INFO]   No effort provided, using default effort.
[INFO]   Adding Source Directory: 

[INFO]   No threshold provided, using default threshold.
[INFO]   Using FindBugs Version: 1.3.8
[INFO]   No threshold provided, using default threshold.
[INFO]   No thresh

[Dhis2-devs] [Bug 744130] Re: NBITS: Clumsy warning message

2011-03-28 Thread Thu Tran
** 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/744130

Title:
  NBITS: Clumsy warning message

Status in DHIS 2 - District Health Information Software:
  Fix Committed

Bug description:
  When Date of incident > Date of Enrollment when enrolling a Patient in
  a Program, the warning message says:

  "Date of Enrollment is greater and equals to Date of incident."

  I guess it should say "should be greater" instead of "is greater"...

___
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] Jenkins build is back to normal : Dhis2 Service Trunk #2363

2011-03-28 Thread support
See 



___
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] Build failed in Jenkins: Dhis2 Web Trunk » DHIS Web Dashboard Integration module #2280

2011-03-28 Thread support
See 


--
[INFO] 
[INFO] Building DHIS Web Dashboard Integration module
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 9 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[HUDSON] Recording test results
[INFO] [surefire:test {execution: default-test}]
[INFO] No tests to run.
[INFO] [war:war {execution: default-war}]
[INFO] Exploding webapp...
[INFO] Assembling webapp dhis-web-dashboard-integration in 

[INFO] Copy webapp webResources to 

[INFO] Building jar: 

[INFO] Expanding: 
/ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/workspace/dhis-2/dhis-web/dhis-web-commons-resources/target/dhis-web-commons-resources-2.2-SNAPSHOT.war
 into 

[INFO] Overlaying 1 war(s).
[INFO] Generating war 

[INFO] Building war: 

[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-dashboard-integration/builds/2011-03-29_06-16-48/archive/org.hisp.dhis/dhis-web-dashboard-integration/2.2-SNAPSHOT/pom.xml
[INFO] 
[ERROR] BUILD ERROR
[INFO] 
[INFO] Error assembling WAR: Problem creating war: Disk quota exceeded

[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 14 minutes 12 seconds
[INFO] Finished at: Tue Mar 29 06:31:07 CEST 2011
[INFO] Final Memory: 188M/449M
[INFO] 


___
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] Build failed in Jenkins: Dhis2 Web Trunk #2280

2011-03-28 Thread support
See 

--
[...truncated 772 lines...]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[INFO] [findbugs:findbugs {execution: default-cli}]
[INFO]   Using source root:
[INFO] 

[INFO]   Using test source root:
[INFO] 

[INFO]   No effort provided, using default effort.
[INFO]   Adding Source Directory: 

[INFO]   No threshold provided, using default threshold.
[INFO]   Using FindBugs Version: 1.3.8
[INFO]   No threshold provided, using default threshold.
[INFO]   No threshold provided, using default threshold.
[INFO]   No threshold provided, using default threshold.
[INFO]   Using the xdoc format
[INFO]   No effort provided, using default effort.
[INFO]   No threshold provided, using default threshold.
[INFO]   No threshold provided, using default threshold.
[INFO]   Debugging is Off
[INFO]   No bug include filter.
[INFO]   Using bug exclude filter /tmp/plexus-resources1443615360tmp
[INFO] Printing Errors
[INFO] Printing Missing classes
[INFO] Printing Source Roots
[FINDBUGS] Successfully parsed file 

 of module DHIS Data Mart with 10 warnings.
[INFO] 
[INFO] Building DHIS Validation Rule
[INFO]task-segment: [clean, install, findbugs:findbugs]
[INFO] 
[INFO] [clean:clean {execution: default-clean}]
[INFO] Deleting directory 

[INFO] [resources:resources {execution: default-resources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 28 source files to 

[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using encoding: 'UTF-8' to copy filtered resources.
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] No tests to run.
[HUDSON] Recording test results
[INFO] [war:war {execution: default-war}]
[INFO] Exploding webapp...
[INFO] Assembling webapp dhis-web-validationrule in 

[INFO] Copy webapp webResources to 

[INFO] Building jar: 

[INFO] Expanding: 

 into 

[INFO] Overlaying 1 war(s).
[INFO] Generating war 

[INFO] Building war: 

[INFO] [install:install {execution: default-install}]
[INFO] Installing 

 to 
/ifi/utgard/p01/dhis/.m2/repository/org/hisp/dhis/dhis-web-validationrule/2.2-SNAPSHOT/dhis-web-validationrule-2.2-SNAPSHOT.war
[INFO] Preparing findbugs:findbugs
[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-validationrule/builds/2011-03-29_06-16-47/archive/org.hisp.dhis/dhis-web-validationrule/2.2-SNAPSHOT/pom.xml
[HUDSON] Archiving 

 to /ifi/utgard/p01/dhis/projects/dhis-dev.ifi.uio.no/ci/home/jobs/Dhis2 Web 
Trunk/modules/org.hisp.dhis$dhis-web-validationrule/builds/2011-03-29_06-16-

[Dhis2-devs] [Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 283: Add new function of Patient module into the document.

2011-03-28 Thread noreply

revno: 283
committer: Tran Chau 
branch nick: dhis2-docbook-docs
timestamp: Tue 2011-03-29 11:31:54 +0700
message:
  Add new function of Patient module into the document.
added:
  src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3a.png
  src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3b.png
  src/docbkx/en/resources/images/patients_programs/Fig. 2.7.4.png
modified:
  src/docbkx/en/dhis2_user_man_NBITS.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_NBITS.xml'
--- src/docbkx/en/dhis2_user_man_NBITS.xml	2011-03-02 09:08:10 +
+++ src/docbkx/en/dhis2_user_man_NBITS.xml	2011-03-29 04:31:54 +
@@ -771,7 +771,7 @@
   Fig. 2.7.2a
   
 
-  
+  
 
   
 
@@ -780,7 +780,7 @@
   Fig. 2.7.2b
   
 
-  
+  
 
   
 
@@ -811,11 +811,37 @@
   
   
 Define a relationship type
-
+From Maintenance menu, go to Beneficiaries and Programs option and click on it. Select Relationship Type option to create a new relationship type.
+
+  Fig. 2.7.3a
+  
+
+  
+
+  
+
+After, click on Add button into Relationship Type Management window to go to Add new Relationship Type window.
+
+  Fig 2.7.3b
+  
+
+  
+
+  
+
   
   
 Beneficary Organisation Unit Registration
-
+This subfunction is used for  managing organisation units which allow registry beneficiaries.
+From Maintenance menu, go to Beneficiaries and Programs option and click on it. Select Benificiary Organisation Unit Registration  option to select organisation units. 
+
+  Fig. 2.7.4
+  
+
+  
+
+  
+
   
   
 Create a new program

=== added file 'src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3a.png'
Binary files src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3a.png	1970-01-01 00:00:00 + and src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3a.png	2011-03-29 04:31:54 + differ
=== added file 'src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3b.png'
Binary files src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3b.png	1970-01-01 00:00:00 + and src/docbkx/en/resources/images/patients_programs/Fig. 2.7.3b.png	2011-03-29 04:31:54 + differ
=== added file 'src/docbkx/en/resources/images/patients_programs/Fig. 2.7.4.png'
Binary files src/docbkx/en/resources/images/patients_programs/Fig. 2.7.4.png	1970-01-01 00:00:00 + and src/docbkx/en/resources/images/patients_programs/Fig. 2.7.4.png	2011-03-29 04:31:54 + differ
___
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