dhis-mobile-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 180
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: lwuit-tracking
timestamp: Fri 2013-11-01 17:05:16 +0700
message:
  validate due date for repeatable events
modified:
  build.xml
  src/org/hisp/dhis/mobile/ui/Text.java
  src/org/hisp/dhis/mobile/view/GenerateRepeatableEventView.java
  src/org/hisp/dhis/mobile/view/PersonRegistrationView.java


--
lp:~dhis-mobile-devs/dhis-mobile/lwuit-tracking
https://code.launchpad.net/~dhis-mobile-devs/dhis-mobile/lwuit-tracking

Your team DHIS mobile developers is subscribed to branch lp:~dhis-mobile-devs/dhis-mobile/lwuit-tracking.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis-mobile-devs/dhis-mobile/lwuit-tracking/+edit-subscription

=== modified file 'build.xml'
--- build.xml	2013-11-01 06:18:37 +0000
+++ build.xml	2013-11-01 10:05:16 +0000
@@ -34,7 +34,7 @@
 	<!-- Which logo to use -->
 	<property name="logo" value="dhis2_logo.png" />
 	<!-- Server URL -->
-	<property name="server.url" value="http://localhost:8080/dhis"; />
+	<property name="server.url" value="http://localhost:9999"; />
 	<!-- User Name -->
 	<property name="username" value="mobile" />
 	<!-- Password -->

=== modified file 'src/org/hisp/dhis/mobile/ui/Text.java'
--- src/org/hisp/dhis/mobile/ui/Text.java	2013-10-23 04:32:49 +0000
+++ src/org/hisp/dhis/mobile/ui/Text.java	2013-11-01 10:05:16 +0000
@@ -739,7 +739,7 @@
 
     public static String REQUIRED_FIELD()
     {
-        return get( (short) 136, "You must fill in all (*) required field(s)!" );
+        return get( (short) 136, "(*)Required field" );
     }
 
     public static String ENTER()

=== modified file 'src/org/hisp/dhis/mobile/view/GenerateRepeatableEventView.java'
--- src/org/hisp/dhis/mobile/view/GenerateRepeatableEventView.java	2013-10-30 09:20:56 +0000
+++ src/org/hisp/dhis/mobile/view/GenerateRepeatableEventView.java	2013-11-01 10:05:16 +0000
@@ -32,6 +32,7 @@
 import org.hisp.dhis.mobile.model.Patient;
 import org.hisp.dhis.mobile.model.ProgramStage;
 import org.hisp.dhis.mobile.ui.Text;
+import org.hisp.dhis.mobile.util.PeriodUtil;
 
 import com.sun.lwuit.Command;
 import com.sun.lwuit.Form;
@@ -61,6 +62,8 @@
 
     private Label lbldueDate;
     
+    private Label lblWrongFormat;
+    
     private String defaultDueDate;
 
     private ProgramStage programStage;
@@ -87,11 +90,36 @@
         }
         else
         {
-            ConnectionManager.setUrl( nameBasedMidlet.getCurrentOrgUnit().getGenerateRepeatableEventUrl() );
-            nameBasedMidlet.getWaitingView().showView();
-            ConnectionManager.generateRepeatableEvent( programStage.getId()+"$"+txtDueDate.getText() );
-        }
-
+            String dueDate = txtDueDate.getText().trim();
+            if ( validateDueDate( dueDate ) == false )
+            {
+                getMainForm().show();
+            }
+            else
+            {
+                ConnectionManager.setUrl( nameBasedMidlet.getCurrentOrgUnit().getGenerateRepeatableEventUrl() );
+                nameBasedMidlet.getWaitingView().showView();
+                ConnectionManager.generateRepeatableEvent( programStage.getId()+"$"+dueDate );
+            }
+        }
+    }
+    
+    public boolean validateDueDate( String dueDate )
+    {
+        if( dueDate.equals( "" ) )
+        {
+            lblWrongFormat.setText( "(*):Required Field" );
+            return false;
+        }
+        else if ( PeriodUtil.isDateValid( dueDate ) == false )
+        {
+            lblWrongFormat.setText( "YYYY-MM-DD" );
+            return false;
+        }
+        else
+        {
+            return true;
+        }
     }
 
     public void prepareView()
@@ -108,8 +136,9 @@
         mainForm.addComponent( getLblProgramStageName() );
         mainForm.addComponent( getLbldueDate() );
         mainForm.addComponent( getTxtDueDate() );
+        mainForm.addComponent( getLblWrongFormat() );
     }
-
+    
     public Form getMainForm()
     {
         if ( mainForm == null )
@@ -188,5 +217,15 @@
         }
         return lblProgramStageName;
     }
+
+    public Label getLblWrongFormat()
+    {
+        if ( lblWrongFormat == null )
+        {
+            lblWrongFormat = new Label();
+            lblWrongFormat.getStyle().setFgColor( 0xcc0000 );
+        }
+        return lblWrongFormat;
+    }
     
 }

=== modified file 'src/org/hisp/dhis/mobile/view/PersonRegistrationView.java'
--- src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-11-01 06:18:37 +0000
+++ src/org/hisp/dhis/mobile/view/PersonRegistrationView.java	2013-11-01 10:05:16 +0000
@@ -587,7 +587,7 @@
                 if ( isRequired && field.getText().trim().equals( "" ) )
                 {
                     Label warningLabel = (Label) requiredIdentifierTable.get( field.getLabelForComponent().getText() );
-                    warningLabel.setText( "(*)Required" );
+                    warningLabel.setText( "(*):Required Field" );
                     this.isValid = false;
                 }