dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33113
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16870: Data entry, disabled check for category option validity for now.
------------------------------------------------------------
revno: 16870
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-09-29 23:58:23 +0200
message:
Data entry, disabled check for category option validity for now.
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.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-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-29 21:12:44 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2014-09-29 21:58:23 +0000
@@ -1213,11 +1213,13 @@
/**
* Tests to see if a category option is valid during a period.
+ *
+ * TODO properly check validity period
+ * TODO option.startDate == null || option.startDate <= dhis2.de.periodChoices[ period ].endDate
*/
dhis2.de.optionValidWithinPeriod = function( option, period )
{
- return ( option.startDate == null || option.startDate <= dhis2.de.periodChoices[ period ].endDate )
- && ( option.endDate == null || option.endDate >= dhis2.de.periodChoices[ period ].startDate )
+ return true;
}
/**