[Dcmms-devel] SF.net SVN: dcmms:[1327] trunk/ms4w/apps/dcmms
Brought to you by:
maher_karim,
sdteffen
From: <mah...@us...> - 2008-10-06 13:13:42
|
Revision: 1327 http://dcmms.svn.sourceforge.net/dcmms/?rev=1327&view=rev Author: maher_karim Date: 2008-10-06 13:10:59 +0000 (Mon, 06 Oct 2008) Log Message: ----------- 2008-10-06 Maher Abdel Karim <Mah...@do...> * htdocs/workorderlist.php: Add the possibility to select the workorders based on network type. * include/dcmmspage.php:adjust copyrights. * include/dataobject/material.php: add validation rule for unit. * include/dataobject/staff.php: adjust query to include unit. * script/create_dcmms_ddl.sql: * script/update_dcmms_ddl.sql: closing RFE#1847757 * include/dataobject/maintenance.php: closing REF#1734383 Modified Paths: -------------- trunk/ms4w/apps/dcmms/ChangeLog trunk/ms4w/apps/dcmms/include/dataobject/Maintenance.php Modified: trunk/ms4w/apps/dcmms/ChangeLog =================================================================== --- trunk/ms4w/apps/dcmms/ChangeLog 2008-10-06 12:28:17 UTC (rev 1326) +++ trunk/ms4w/apps/dcmms/ChangeLog 2008-10-06 13:10:59 UTC (rev 1327) @@ -7,6 +7,7 @@ * include/dataobject/staff.php: adjust query to include unit. * script/create_dcmms_ddl.sql: * script/update_dcmms_ddl.sql: closing RFE#1847757 + * include/dataobject/maintenance.php: closing REF#1734383 2008-09-15 Maher Abdel Karim <Mah...@do...> Modified: trunk/ms4w/apps/dcmms/include/dataobject/Maintenance.php =================================================================== --- trunk/ms4w/apps/dcmms/include/dataobject/Maintenance.php 2008-10-06 12:28:17 UTC (rev 1326) +++ trunk/ms4w/apps/dcmms/include/dataobject/Maintenance.php 2008-10-06 13:10:59 UTC (rev 1327) @@ -113,6 +113,10 @@ $this->fb_submitText = _('Submit'); $this->fb_requiredRuleMessage = _('%s Please enter a value.'); $this->fb_ruleViolationMessage = _('%s The value is invalid.'); + $this->fb_preDefElements['startdate']=HTML_QuickForm::createElement( + 'date', 'startdate', _('Start Date:'),array('minYear'=>'1975','format'=>'dmY H:i')); + $this->fb_preDefElements['completiondate']=HTML_QuickForm::createElement( + 'date', 'completiondate', _('Completion Date:'),array('minYear'=>'1975','format'=>'dmY H:i')); } /** @@ -165,11 +169,12 @@ $form->addRule('note', _('The maximum length of the note field is 256 characters.'), 'maxlength', 256, $_SESSION['strHtmlQuickFormValidation']); - $form->addRule('startdate', 'Incorrect start date format.', 'regex', + /* $form->addRule('startdate', 'Incorrect start date format.', 'regex', '/^(\d{4})\D?(0[1-9]|1[0-2])\D?([12]\d|0[1-9]|3[01])(\D?([01]\d|2[0-3])\D?([0-5]\d)\D?([0-5]\d)?)?$/'); $form->addRule('completiondate', 'Incorrect completion date format.', 'regex', '/^(\d{4})\D?(0[1-9]|1[0-2])\D?([12]\d|0[1-9]|3[01])(\D?([01]\d|2[0-3])\D?([0-5]\d)\D?([0-5]\d)?)?$/'); - $form->setRequiredNote('<span style="font-size:80%; color:#ff0000;" + */ + $form->setRequiredNote('<span style="font-size:80%; color:#ff0000;" >*</span><span style="font-size:80%;"> '. _('denotes required field').'</span>'); if($_SESSION['language'] == 'ar') { @@ -204,6 +209,8 @@ if(isset($this->y)) { unset($this->y); } + $this->startdate=''.$_POST['startdate'][Y].'-'.$_POST['startdate'][m].'-'.$_POST['startdate'][d].' '.$_POST['startdate'][H].':'.$_POST['startdate'][i].''; + $this->completiondate=''.$_POST['completiondate'][Y].'-'.$_POST['completiondate'][m].'-'.$_POST['completiondate'][d].' '.$_POST['completiondate'][H].':'.$_POST['completiondate'][i].''; return parent::update($do); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |