[Dhis2-devs] Option to cancel (not upload) the offline data
Dear Team, As we have a nice feature for upload of offline data entry, was imagining a situation where you may not want to upload data, probably yo changed something accidentally while offline and you are not able to edit SO on asking whether to upload data there should be an option to accept or not upload Regards -- Prosper Behumbiize, MPH Phone:+256 414 320076 Cell: +256 772 139037 +256 752 751776 ___ 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] Option to cancel (not upload) the offline data
Maybe this is completely off rail but most times you are not even sure what the data is. Perhaps an option to review either as a csv output with org units, period, data set, data elements and values would be great. You may consider this a nice to have feature rather than a must have but it would definitely be helpful. Cheers. Busoye On 19 Sep 2014, at 10:32, Prosper BT ptb3...@gmail.com wrote: Dear Team, As we have a nice feature for upload of offline data entry, was imagining a situation where you may not want to upload data, probably yo changed something accidentally while offline and you are not able to edit SO on asking whether to upload data there should be an option to accept or not upload Regards -- Prosper Behumbiize, MPH Phone:+256 414 320076 Cell: +256 772 139037 +256 752 751776 ___ 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 16752: fix bug with reminder cause by lazy init from sms
revno: 16752 committer: Long Ngo Thanh thanhlongngo1...@yahoo.com.vn branch nick: dhis2 timestamp: Fri 2014-09-19 19:49:35 +0700 message: fix bug with reminder cause by lazy init from sms modified: dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml 2013-08-12 03:29:54 + +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml 2014-09-19 12:49:35 + @@ -4,7 +4,7 @@ http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd; hibernate-mapping - class name=org.hisp.dhis.sms.outbound.OutboundSms table=outbound_sms + class name=org.hisp.dhis.sms.outbound.OutboundSms table=outbound_sms lazy=false id name=id generator class=native / ___ 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 16753: Validation, adding check for max and min values for integers and numerics. This to avoid potentia...
revno: 16753
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-09-19 15:35:52 +0200
message:
Validation, adding check for max and min values for integers and numerics.
This to avoid potential buffer overflows when parsing data values.
modified:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/MathUtilsTest.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-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java 2014-07-27 16:58:03 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java 2014-09-19 13:35:52 +
@@ -34,6 +34,8 @@
import java.util.Random;
import java.util.regex.Pattern;
+import org.apache.commons.validator.routines.DoubleValidator;
+import org.apache.commons.validator.routines.IntegerValidator;
import org.hisp.dhis.datavalue.DataValue;
import org.hisp.dhis.expression.Operator;
import org.nfunk.jep.JEP;
@@ -45,6 +47,9 @@
{
public static final Double ZERO = new Double( 0 );
+private static DoubleValidator DOUBLE_VALIDATOR = new DoubleValidator();
+private static IntegerValidator INT_VALIDATOR = new IntegerValidator();
+
private static final double TOLERANCE = 0.01;
public static final String NUMERIC_REGEXP = ^(-?0|-?[1-9]\\d*)(\\.\\d+)?(E\\d+)?$;
@@ -301,7 +306,7 @@
*/
public static boolean isNumeric( String value )
{
-return value != null NUMERIC_PATTERN.matcher( value ).matches();
+return value != null DOUBLE_VALIDATOR.isValid( value ) NUMERIC_PATTERN.matcher( value ).matches();
}
/**
@@ -313,7 +318,7 @@
*/
public static boolean isNumericLenient( String value )
{
-return value != null NUMERIC_LENIENT_PATTERN.matcher( value ).matches();
+return value != null DOUBLE_VALIDATOR.isValid( value ) NUMERIC_LENIENT_PATTERN.matcher( value ).matches();
}
/**
@@ -363,7 +368,7 @@
*/
public static boolean isInteger( String value )
{
-return value != null INT_PATTERN.matcher( value ).matches();
+return value != null INT_VALIDATOR.isValid( value ) INT_PATTERN.matcher( value ).matches();
}
/**
@@ -376,7 +381,7 @@
*/
public static boolean isPositiveInteger( String value )
{
-return value != null POSITIVE_INT_PATTERN.matcher( value ).matches();
+return value != null INT_VALIDATOR.isValid( value ) POSITIVE_INT_PATTERN.matcher( value ).matches();
}
/**
@@ -389,7 +394,7 @@
*/
public static boolean isZeroOrPositiveInteger( String value )
{
-return value != null POSITIVE_OR_ZERO_INT_PATTERN.matcher( value ).matches();
+return value != null INT_VALIDATOR.isValid( value ) POSITIVE_OR_ZERO_INT_PATTERN.matcher( value ).matches();
}
/**
@@ -402,7 +407,7 @@
*/
public static boolean isNegativeInteger( String value )
{
-return value != null NEGATIVE_INT_PATTERN.matcher( value ).matches();
+return value != null INT_VALIDATOR.isValid( value ) NEGATIVE_INT_PATTERN.matcher( value ).matches();
}
/**
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/MathUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/MathUtilsTest.java 2014-07-21 09:45:25 +
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/MathUtilsTest.java 2014-09-19 13:35:52 +
@@ -215,6 +215,7 @@
assertFalse( MathUtils.isInteger( 1 ) );
assertFalse( MathUtils.isInteger( 1 ) );
assertFalse( MathUtils.isInteger( 1.2345 ) );
+assertFalse( MathUtils.isInteger( 12147483647 ) );
}
@Test
___
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 16754: Data value, removed the max length constraint on value and comment in database, service layer and...
revno: 16754
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-09-19 16:10:47 +0200
message:
Data value, removed the max length constraint on value and comment in
database, service layer and data entry. This allows for entering long text such
as narratives directly e.g. using custom forms.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-09-15 20:06:58 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-09-19 14:10:47 +
@@ -736,6 +736,9 @@
executeSql( alter table indicator drop column sortorder );
executeSql( alter table dataset drop column sortorder );
+executeSql( alter table datavalue alter column value type character varying );
+executeSql( alter table datavalue alter column comment type character varying );
+
upgradeDataValuesWithAttributeOptionCombo();
upgradeCompleteDataSetRegistrationsWithAttributeOptionCombo();
upgradeMapViewsToAnalyticalObject();
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2014-07-21 09:45:25 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2014-09-19 14:10:47 +
@@ -28,21 +28,29 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_AVERAGE;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_BOOL;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_DATE;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_INT;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_NEGATIVE_INT;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_NUMBER;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_PERCENTAGE;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_POSITIVE_INT;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_TRUE_ONLY;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_UNIT_INTERVAL;
+import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_ZERO_OR_POSITIVE_INT;
+
+import java.awt.geom.Point2D;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.apache.commons.validator.routines.DateValidator;
import org.apache.commons.validator.routines.EmailValidator;
import org.apache.commons.validator.routines.UrlValidator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.datavalue.DataValue;
-import java.awt.geom.Point2D;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.hisp.dhis.dataelement.DataElement.*;
-
/**
* @author Lars Helge Overland
* @version $Id$
@@ -244,7 +252,6 @@
*
* ul
* lidata_element_or_type_null_or_empty/li
- * livalue_length_greater_than_max_length/li
* livalue_not_numeric/li
* livalue_not_unit_interval/li
* livalue_not_percentage/li
@@ -272,16 +279,8 @@
return data_element_or_type_null_or_empty;
}
-ListString types = Arrays.asList( VALUE_TYPE_STRING, VALUE_TYPE_INT, VALUE_TYPE_NUMBER,
-VALUE_TYPE_POSITIVE_INT, VALUE_TYPE_NEGATIVE_INT, VALUE_TYPE_ZERO_OR_POSITIVE_INT );
-
String type = dataElement.getDetailedNumberType();
-if ( types.contains( type ) value.length() 255 )
-{
-return value_length_greater_than_max_length;
-}
-
if ( VALUE_TYPE_NUMBER.equals( type ) !MathUtils.isNumeric( value ) )
{
return value_not_numeric;
@@ -366,11 +365,6 @@
return null;
}
-if ( comment.length() 360 )
-
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16755: Reverted r 16754. Mysql not happy.
revno: 16755
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-09-19 17:50:55 +0200
message:
Reverted r 16754. Mysql not happy.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-09-19 14:10:47 +
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-09-19 15:50:55 +
@@ -736,9 +736,6 @@
executeSql( alter table indicator drop column sortorder );
executeSql( alter table dataset drop column sortorder );
-executeSql( alter table datavalue alter column value type character varying );
-executeSql( alter table datavalue alter column comment type character varying );
-
upgradeDataValuesWithAttributeOptionCombo();
upgradeCompleteDataSetRegistrationsWithAttributeOptionCombo();
upgradeMapViewsToAnalyticalObject();
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2014-09-19 14:10:47 +
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2014-09-19 15:50:55 +
@@ -28,29 +28,21 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_AVERAGE;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_BOOL;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_DATE;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_INT;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_NEGATIVE_INT;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_NUMBER;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_PERCENTAGE;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_POSITIVE_INT;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_TRUE_ONLY;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_UNIT_INTERVAL;
-import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_ZERO_OR_POSITIVE_INT;
-
-import java.awt.geom.Point2D;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import org.apache.commons.validator.routines.DateValidator;
import org.apache.commons.validator.routines.EmailValidator;
import org.apache.commons.validator.routines.UrlValidator;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.datavalue.DataValue;
+import java.awt.geom.Point2D;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.hisp.dhis.dataelement.DataElement.*;
+
/**
* @author Lars Helge Overland
* @version $Id$
@@ -252,6 +244,7 @@
*
* ul
* lidata_element_or_type_null_or_empty/li
+ * livalue_length_greater_than_max_length/li
* livalue_not_numeric/li
* livalue_not_unit_interval/li
* livalue_not_percentage/li
@@ -279,8 +272,16 @@
return data_element_or_type_null_or_empty;
}
+ListString types = Arrays.asList( VALUE_TYPE_STRING, VALUE_TYPE_INT, VALUE_TYPE_NUMBER,
+VALUE_TYPE_POSITIVE_INT, VALUE_TYPE_NEGATIVE_INT, VALUE_TYPE_ZERO_OR_POSITIVE_INT );
+
String type = dataElement.getDetailedNumberType();
+if ( types.contains( type ) value.length() 255 )
+{
+return value_length_greater_than_max_length;
+}
+
if ( VALUE_TYPE_NUMBER.equals( type ) !MathUtils.isNumeric( value ) )
{
return value_not_numeric;
@@ -365,6 +366,11 @@
return null;
}
+if ( comment.length() 360 )
+{
+return comment_too_long;
+}
+
return null;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
---
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16756: Nullpointer vulnerability fixes
revno: 16756
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2014-09-19 18:13:09 +0200
message:
Nullpointer vulnerability fixes
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.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-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java 2014-08-15 07:40:20 +
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java 2014-09-19 16:13:09 +
@@ -197,14 +197,14 @@
User user = currentUserService.getCurrentUser();
-if ( user.getOrganisationUnits() != null user.getOrganisationUnits().size() 0 )
+if ( user != null user.getOrganisationUnits() != null user.getOrganisationUnits().size() 0 )
{
userOrganisationUnits = new ArrayList( user.getOrganisationUnits() );
rootOrganisationUnits = new ArrayList( user.getOrganisationUnits() );
}
else
{
-if ( user.getOrganisationUnits() != null currentUserService.currentUserIsSuper() )
+if ( user != null user.getOrganisationUnits() != null currentUserService.currentUserIsSuper() )
{
userOrganisationUnits = new ArrayList( organisationUnitService.getRootOrganisationUnits() );
rootOrganisationUnits = new ArrayList( organisationUnitService.getRootOrganisationUnits() );
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2014-08-15 07:40:20 +
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2014-09-19 16:13:09 +
@@ -215,7 +215,7 @@
{
User user = currentUserService.getCurrentUser();
-if ( user.getOrganisationUnits().isEmpty() )
+if ( user != null user.getOrganisationUnits().isEmpty() )
{
emptyOrganisationUnits = true;
___
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 16757: Set max length for datavalue value and comment + audit value to 50 000 characters
revno: 16757 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Fri 2014-09-19 19:13:55 +0200 message: Set max length for datavalue value and comment + audit value to 50 000 characters modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.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-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-09-19 15:50:55 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-09-19 17:13:55 + @@ -735,6 +735,10 @@ executeSql( alter table dataelement drop column sortorder ); executeSql( alter table indicator drop column sortorder ); executeSql( alter table dataset drop column sortorder ); + +executeSql( alter table datavalue alter column value type character varying(5) ); +executeSql( alter table datavalue alter column comment type character varying(5) ); +executeSql( alter table datavalueaudit alter column value type character varying(5) ); upgradeDataValuesWithAttributeOptionCombo(); upgradeCompleteDataSetRegistrationsWithAttributeOptionCombo(); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml 2014-07-07 10:45:27 + +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml 2014-09-19 17:13:55 + @@ -14,7 +14,7 @@ key-many-to-one name=attributeOptionCombo class=org.hisp.dhis.dataelement.DataElementCategoryOptionCombo column=attributeoptioncomboid foreign-key=fk_datavalue_attributeoptioncomboid / /composite-id -property name=value length=255 / +property name=value length=5 / property name=storedBy column=storedby length=100 / @@ -22,7 +22,7 @@ property name=lastUpdated column=lastupdated type=timestamp index=in_datavalue_lastupdated / -property name=comment length=360 / +property name=comment length=5 / property name=followup / === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml 2014-07-09 13:43:43 + +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml 2014-09-19 17:13:55 + @@ -22,7 +22,7 @@ many-to-one name=categoryOptionCombo class=org.hisp.dhis.dataelement.DataElementCategoryOptionCombo column=categoryoptioncomboid foreign-key=fk_datavalueaudit_categoryoptioncomboid not-null=true/ -property name=value length=255 / +property name=value length=5 / property name=timestamp column=timestamp type=timestamp not-null=true index=id_datavalueaudit_timestamp/ === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2014-09-19 15:50:55 + +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java 2014-09-19 17:13:55 + @@ -28,21 +28,29 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_AVERAGE; +import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_BOOL; +import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_DATE; +import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_INT; +import
[Dhis2-devs] Cannot upload apps to demo
Hi all devs, I was trying to test my app onto demo area and i need to upload the app.When i was uploading the progress bar shows completely uploaded but i cannot find my uploaded app. Can Someone help? Best RegardsWin Htaik Aung(WHA)Contact on Skype winhtaikaung28 ___ 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
