~intrahealth+informatics/ihris-plan/1.0.4-release

Added initial projection lines to the model page to show how the projection looked as of the initial year.

added added

removed removed

$start_year = $proj->start_year->year();

$duration = $proj->duration;

$year = $this->year->year();

if ( !I2CE_Validate::checkNumber( $this->target, 0 ) && !I2CE_Validate::checkNumber( $this->ratio, 0 ) ) {

$page->setFormInvalid( $this->getField( "ratio" )->getHTMLName(), "Please enter either a target number or ratio." );

$page->setFormInvalid( $this->getField( "target" )->getHTMLName(), "Please enter either a target number or ratio." );

} elseif ( I2CE_Validate::checkNumber( $this->target, 0 ) && I2CE_Validate::checkNumber( $this->ratio, 0 ) ) {

$page->setFormInvalid( $this->getField( "ratio" )->getHTMLName(), "Please enter either a target number OR ratio, not both." );

$page->setFormInvalid( $this->getField( "target" )->getHTMLName(), "Please enter either a target number OR ratio, not both." );

}

if ( $year < $proj->start_year->year() || $year > $start_year+$duration ) {

$page->setFormInvalid( $this->getField( "year" )->getHTMLName(), "The year is outside the range for this projection." );

} else {