dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5726
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-01-13 15:46:31 +0530
message:
  (mobile) minor fixes, login-page, dataentry..
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetOverviewAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.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/security/login_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-28 19:31:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2012-01-13 10:16:31 +0000
@@ -17,6 +17,14 @@
 </div>
 
 <div id="content" align="center" style="text-align: left;">
+
+#if( $failed == true )
+<div class="header-box" align="center">
+	<h3 style="text-align: left; background-color: red; color: black;">Wrong username or password</h3>
+</div>
+#end
+
+
 <form id='loginForm' action="../../dhis-web-commons-security/login.action" method="POST">
 
 <div class="header-box" align="center">
@@ -38,11 +46,5 @@
 </div>
 </div>
 
-#if( $failed == true )
-<p style="color: #eee;">
-	Wrong username or password. Please try again.
-</p>
-#end
-
 </body>
 </html>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java	2012-01-13 10:16:31 +0000
@@ -75,8 +75,7 @@
     @Override
     public String execute()
     {
-        HttpServletRequest request = ServletActionContext.getRequest();
-        Device device = deviceResolver.resolveDevice( request );
+        Device device = deviceResolver.resolveDevice( ServletActionContext.getRequest() );
 
         if ( device.isMobile() )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetOverviewAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetOverviewAction.java	2012-01-12 07:01:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetOverviewAction.java	2012-01-13 10:16:31 +0000
@@ -160,16 +160,16 @@
         return complete;
     }
 
-    private Boolean markComplete;
+    private Boolean formComplete;
 
-    public Boolean getMarkComplete()
+    public Boolean getFormComplete()
     {
-        return markComplete;
+        return formComplete;
     }
 
-    public void setMarkComplete( Boolean markComplete )
+    public void setFormComplete( Boolean formComplete )
     {
-        this.markComplete = markComplete;
+        this.formComplete = formComplete;
     }
 
     private boolean validated;
@@ -213,9 +213,9 @@
 
         complete = registration != null ? true : false;
 
-        if ( markComplete != null )
+        if ( formComplete != null )
         {
-            if ( markComplete && !complete )
+            if ( formComplete && !complete )
             {
                 registration = new CompleteDataSetRegistration();
                 registration.setDataSet( dataSet );
@@ -228,7 +228,7 @@
 
                 complete = true;
             }
-            else if ( !markComplete && complete )
+            else if ( !formComplete && complete )
             {
                 registrationService.deleteCompleteDataSetRegistration( registration );
 

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-01-12 08:43:22 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-01-13 10:16:31 +0000
@@ -38,14 +38,9 @@
 minmax_violation_warnings=Min/Max Violation Warnings
 type_violation_errors=Type Violation Errors
 
-mark_as_complete=Mark as complete
-mark_as_not_complete=Mark as not complete
-
 messages=Messages
 conversations=Conversations
 subject=Subject
 reply=Reply
 write_feedback=Write feedback
-successfully_marked_as_complete=Successfully marked as complete
-successfully_marked_as_not_complete=Successfully marked as not complete
-successfully_saved_section=Successfully saved
+form_complete=Form complete

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm	2012-01-12 07:01:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm	2012-01-13 10:16:31 +0000
@@ -8,10 +8,8 @@
 <h2>$encoder.htmlEncode( $dataSetName )</h2>
 
 <div class="header-box" align="center">
-#if( $markComplete == true )
-    <h3 style="text-align: left;">$i18n.getString( "successfully_marked_as_complete" )</h3>
-#elseif( $markComplete == false )
-    <h3 style="text-align: left;">$i18n.getString( "successfully_marked_as_not_complete" )</h3>
+#if( $complete == true )
+    <h3 style="text-align: left;">$i18n.getString( "form_complete" )</h3>
 #end
 </div>
 
@@ -54,17 +52,15 @@
 <input type="hidden" id="dataSetId" name="dataSetId" value="$dataSetId" />
 <input type="hidden" id="periodId" name="periodId" value="$periodId" />
 
+#if( $complete == false )
 <div class="header-box" align="center">
     <p>
-        #if($complete)
-            <input type="hidden" name="markComplete" value="false" />
-            <input type="submit" style="width: 100%;" value="$i18n.getString("mark_as_not_complete")" />
-        #else
-            <input type="hidden" name="markComplete" value="true" />
-            <input type="submit" style="width: 100%;" value="$i18n.getString("mark_as_complete")" />
-        #end
+            <input type="hidden" name="formComplete" value="true" />
+            <input type="submit" style="width: 100%;" value="$i18n.getString("form_complete")" />
     </p>
 </div>
+#end
+
 </form>
 
 <div id="footer">

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm	2012-01-12 07:01:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm	2012-01-13 10:16:31 +0000
@@ -49,12 +49,6 @@
 				#set( $dataElementName = $dataElement.name )
 			#end
 
-            #if( $dataElement.code )
-                #set( $name = "[$dataElement.code] - $dataElementName")
-            #else
-                #set( $name = "$dataElementName" )
-            #end
-
             #set( $optionCombos = $formUtils.sortedCategoryOptionCombos( $dataElement.categoryCombo.optionCombos ) )
 
 			#foreach( $optionCombo in $optionCombos )
@@ -62,7 +56,7 @@
                 #if( !$greyedFields.get( "$dataElement.id:$optionCombo.id" ) )
 				#set( $key = "DE${dataElement.id}OC${optionCombo.id}" )
 
-				<label>$encoder.htmlEncode( $name ) #if( $optionCombo.name!="(default)")$encoder.htmlEncode( $optionCombo.name )#end</label>
+				<label>$encoder.htmlEncode( $dataElementName ) #if( $optionCombo.name!="(default)")$encoder.htmlEncode( $optionCombo.name )#end</label>
 
 				#if( $validationViolations.get( $key ) )
 					#set( $validationViolation = $validationViolations.get( $key ) )