fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

render defaultvalue grid datepicker

Browse Source
This commit is contained in:
Alvaro Campos
2011-02-10 13:08:29 +00:00
parent 2e001176ec
commit 1c0b2c96b9
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gulliver/system/class.xmlform.php
View File

@@ -3023,7 +3023,8 @@ 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 );
$value1=$this->defaultValue; $valueaux=$value;
$value=$this->defaultValue;
if ($startDate != '') { if ($startDate != '') {
if (! $this->verifyDateFormat ( $startDate )) if (! $this->verifyDateFormat ( $startDate ))
@@ -3104,14 +3105,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($value1)){ switch(strtolower($value)){
case 'today': case 'today':
// $value = date($tmp); // $value = date($tmp);
$value1=masktophp ($mask); $value=masktophp ($mask);
break; break;
default: default:
if(!$this->verifyDateFormat($value)) if(!$this->verifyDateFormat($value))
$value1=''; $value='';
break; break;
} }
} }
@@ -3141,6 +3142,14 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
} else { } else {
$sizeend = $maskleng + 2; $sizeend = $maskleng + 2;
} }
$value1=$value;
$value=$valueaux;
if((($value==NULL))){
$value=$value1;
}
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="'.$value1.'"/>' $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;"/> '
@@ -3164,7 +3173,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
. '<image src="/images/help5.gif" width="15" height="15" border="0" style="position:relative;left:-17px;top:0px;"/>' . '<image src="/images/help5.gif" width="15" height="15" border="0" style="position:relative;left:-17px;top:0px;"/>'
. '</a>'; . '</a>';
} }
return $html; return $html;
} }
} }