fixed render value datepicker

This commit is contained in:
Alvaro Campos
2011-02-08 15:21:10 +00:00
parent d3ae26fa07
commit 4730c7f9d9

View File

@@ -3023,7 +3023,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
$endDate = G::replaceDataField ( $this->endDate, $owner->values ); $endDate = G::replaceDataField ( $this->endDate, $owner->values );
$beforeDate = G::replaceDataField ( $this->beforeDate, $owner->values ); $beforeDate = G::replaceDataField ( $this->beforeDate, $owner->values );
$afterDate = G::replaceDataField ( $this->afterDate, $owner->values ); $afterDate = G::replaceDataField ( $this->afterDate, $owner->values );
$value=$this->defaultValue; $value1=$this->defaultValue;
if ($startDate != '') { if ($startDate != '') {
if (! $this->verifyDateFormat ( $startDate )) if (! $this->verifyDateFormat ( $startDate ))
@@ -3104,14 +3104,14 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
if ( trim ($value) == '' or $value == NULL ) { if ( trim ($value) == '' or $value == NULL ) {
$value = ''; //date ($tmp); $value = ''; //date ($tmp);
} else { } else {
switch(strtolower($value)){ switch(strtolower($value1)){
case 'today': case 'today':
// $value = date($tmp); // $value = date($tmp);
$value=masktophp ($mask); $value1=masktophp ($mask);
break; break;
default: default:
if(!$this->verifyDateFormat($value)) if(!$this->verifyDateFormat($value))
$value=''; $value1='';
break; break;
} }
} }
@@ -3142,13 +3142,13 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
$sizeend = $maskleng + 2; $sizeend = $maskleng + 2;
} }
if ( $this->editable != "0") { if ( $this->editable != "0") {
$html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'" pm:defaultvalue="'.$value.'"/>' $html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'" pm:defaultvalue="'.$value1.'"/>'
. '<a onclick="removeValue(\''.$pID.'\'); return false;"/> ' . '<a onclick="removeValue(\''.$pID.'\'); return false;"/> '
. '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>' . '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>'
. '<a id="'.$pID.'[btn]"><img src="/images/pmdateicon.png" border="0" width="12" height="12" style="position:relative;left:-17px;top:0px;"/></a>' . '<a id="'.$pID.'[btn]"><img src="/images/pmdateicon.png" border="0" width="12" height="12" style="position:relative;left:-17px;top:0px;"/></a>'
. '<script>datePicker4("", \''.$pID.'\', \''.$mask.'\', \''.$startDate.'\', \''.$endDate.'\','.$Time.')</script>'; . '<script>datePicker4("", \''.$pID.'\', \''.$mask.'\', \''.$startDate.'\', \''.$endDate.'\','.$Time.')</script>';
} else { } else {
$html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'"pm:defaultvalue="'.$value.'" readonly="readonly"/>' $html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'"pm:defaultvalue="'.$value1.'" readonly="readonly"/>'
. '<a onclick="removeValue(\''.$pID.'\'); return false;"/> ' . '<a onclick="removeValue(\''.$pID.'\'); return false;"/> '
. '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>' . '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>'
. '<a id="'.$pID.'[btn]"><img src="/images/pmdateicon.png" border="0" width="12" height="12" style="position:relative;left:-17px;top:0px;"/></a>' . '<a id="'.$pID.'[btn]"><img src="/images/pmdateicon.png" border="0" width="12" height="12" style="position:relative;left:-17px;top:0px;"/></a>'