capwelton / libapp

programs/ui/base.ui.php

Indentation +11 added lines, -11 removed lines

@@ -102,7 +102,7 @@ 
     public function __construct(Func_App $app, $id = null, Widget_Layout $layout = null)
     {
         parent::__construct($app);
-         // We simulate inheritance from Widget_VBoxLayout.
+            // We simulate inheritance from Widget_VBoxLayout.
         $W = $this->widgets = bab_Widgets();
 
 
@@ -307,9 +307,9 @@ 
             $cancelLabel = isset($this->cancelLabel) ? $this->cancelLabel : $App->translate('Cancel');
             $this->addButton(
                 $W->SubmitButton(/*'cancel'*/)
-                     ->addClass('widget-close-dialog')
+                        ->addClass('widget-close-dialog')
                     ->setAction($this->cancelAction)
-                      ->setLabel($cancelLabel)
+                        ->setLabel($cancelLabel)
             );
         }
 
@@ -1148,21 +1148,21 @@ 
 
 
 
-	protected function addCustomFields(app_RecordSet $recordSet)
-	{
-		$customFields = $recordSet->getCustomFields();
+    protected function addCustomFields(app_RecordSet $recordSet)
+    {
+        $customFields = $recordSet->getCustomFields();
 
         foreach ($customFields as $customField) {
             $fieldname = $customField->fieldname;
             $this->addColumn(
                 widget_TableModelViewColumn($recordSet->$fieldname, $customField->name)
-                  ->setSortable(true)
-                  ->setExportable(true)
-                  ->setSearchable($customField->searchable)
-				  ->setVisible($customField->visible)
+                    ->setSortable(true)
+                    ->setExportable(true)
+                    ->setSearchable($customField->searchable)
+                    ->setVisible($customField->visible)
             );
         }
-	}
+    }
 
 
     /**

programs/record.ctrl.php

Indentation +1 added lines, -1 removed lines

@@ -1642,7 +1642,7 @@
             $W->SubmitButton()
                 ->setAjaxAction($confirmedAction)
                 ->setLabel($App->translate('Delete'))
-         );
+            );
         $form->addButton($W->SubmitButton()->setLabel($App->translate('Cancel'))->addClass('widget-close-dialog'));
         $page->addItem($form);
 

programs/controller.class.php

Indentation +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@
 
 class app_UnknownActionException extends Exception
 {
-	public function __construct($action, $code = 0)
-	{
-		$message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
-		parent::__construct($message, $code);
-	}
+    public function __construct($action, $code = 0)
+    {
+        $message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
+        parent::__construct($message, $code);
+    }
 }
 
 

programs/link.class.php

Indentation +197 added lines, -197 removed lines

@@ -69,205 +69,205 @@
 
 
 
-	/**
-	 * @param	string	$sourceClass
-	 */
-	public function joinSource($sourceClass)
-	{
-	    if (get_class($this->sourceId) !== $sourceClass . 'Set') {
-    	    $this->hasOne('sourceId', $sourceClass . 'Set');
-    		$this->join('sourceId');
-	    }
-	}
-
-
-	/**
-	 * @param	string	$targetClass
-	 */
-	public function joinTarget($targetClass = null)
-	{
-	    if (get_class($this->targetId) !== $targetClass . 'Set') {
-    		$this->hasOne('targetId', $targetClass . 'Set');
-    		$this->join('targetId');
-	    }
-	}
-
-
-
-	public function sourceIsA($recordClass)
-	{
-		return $this->sourceClass->is($recordClass);
-	}
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)
-	{
-		$criteria = $this->sourceId->is($object->id)
+    /**
+     * @param	string	$sourceClass
+     */
+    public function joinSource($sourceClass)
+    {
+        if (get_class($this->sourceId) !== $sourceClass . 'Set') {
+            $this->hasOne('sourceId', $sourceClass . 'Set');
+            $this->join('sourceId');
+        }
+    }
+
+
+    /**
+     * @param	string	$targetClass
+     */
+    public function joinTarget($targetClass = null)
+    {
+        if (get_class($this->targetId) !== $targetClass . 'Set') {
+            $this->hasOne('targetId', $targetClass . 'Set');
+            $this->join('targetId');
+        }
+    }
+
+
+
+    public function sourceIsA($recordClass)
+    {
+        return $this->sourceClass->is($recordClass);
+    }
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)
+    {
+        $criteria = $this->sourceId->is($object->id)
             ->_AND_($this->sourceClass->is(get_class($object)));
 
-		if (isset($targetClass)) {
-		    $this->joinTarget($targetClass);
-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		if (is_a($this->targetId, 'app_TraceableRecordSet')) {
-			$criteria = $criteria->_AND_($this->targetId->deleted->is(false));
-		}
-
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForSources($objects, $targetClass, $linkType = null)
-	{
-		$sourceClass = null;
-		$sourceIds = array();
-
-		foreach ($objects as $obj) {
-			if (is_null($sourceClass)) {
-				$sourceClass = get_class($obj);
-			}
-			$sourceIds[] = $obj->id;
-		}
-		$criteria = $this->sourceId->in($sourceIds)
-			->_AND_($this->sourceClass->is($sourceClass));
-
-		if (isset($targetClass)) {
-		    $this->joinTarget($targetClass);
-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)
-	{
-		$criteria = $this->targetId->is($object->id)
-			->_AND_($this->targetClass->is(get_class($object)));
-
-		if (isset($sourceClass)) {
-		    $this->joinSource($sourceClass);
-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForTargets($objects, $sourceClass = null, $linkType = null)
-	{
-		$targetClass = null;
-		$targetIds = array();
-
-		foreach ($objects as $obj) {
-			if (is_null($targetClass)) {
-				$targetClass = get_class($obj);
-			}
-			$targetIds[] = $obj->id;
-		}
-		$criteria = $this->targetId->in($targetIds)
-			->_AND_($this->targetClass->is($targetClass));
-
-		if (isset($sourceClass)) {
-		    $this->joinSource($sourceClass);
-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		return $this->select($criteria);
-	}
-
-
-
-	/**
-	 * delete all links to an object
-	 *
-	 * @param	app_Record		$object
-	 * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes
-	 * @param	bool			$deleteTarget	if set to true, the target will be deleted to
-	 */
-	public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)
-	{
-		$set = clone $this;
-		$App = $object->App();
-
-		$criteria = $set->sourceId->is($object->id)->_AND_(
-			$set->sourceClass->is(get_class($object))
-		);
-
-		if (null !== $targetClass) {
-			$criteria = $criteria->_AND_(
-				$set->targetClass->is($targetClass)
-			);
-		}
-		if (null !== $linkType) {
-			$criteria = $criteria->_AND_(
-				$set->type->is($linkType)
-			);
-		}
-
-		if ($deleteTarget) {
-			foreach($set->select($criteria) as $link) {
-
-				$className = $link->targetClass.'Set';
-
-				// remove prefix
-
-				$className = mb_substr($className, 1 + mb_strpos($className, '_'));
-				$targetSet = $App->$className();
-
-				$targetSet->delete($targetSet->id->is($link->targetId));
-			}
-		}
-
-		return $set->delete($criteria);
-	}
+        if (isset($targetClass)) {
+            $this->joinTarget($targetClass);
+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        if (is_a($this->targetId, 'app_TraceableRecordSet')) {
+            $criteria = $criteria->_AND_($this->targetId->deleted->is(false));
+        }
+
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForSources($objects, $targetClass, $linkType = null)
+    {
+        $sourceClass = null;
+        $sourceIds = array();
+
+        foreach ($objects as $obj) {
+            if (is_null($sourceClass)) {
+                $sourceClass = get_class($obj);
+            }
+            $sourceIds[] = $obj->id;
+        }
+        $criteria = $this->sourceId->in($sourceIds)
+            ->_AND_($this->sourceClass->is($sourceClass));
+
+        if (isset($targetClass)) {
+            $this->joinTarget($targetClass);
+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)
+    {
+        $criteria = $this->targetId->is($object->id)
+            ->_AND_($this->targetClass->is(get_class($object)));
+
+        if (isset($sourceClass)) {
+            $this->joinSource($sourceClass);
+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForTargets($objects, $sourceClass = null, $linkType = null)
+    {
+        $targetClass = null;
+        $targetIds = array();
+
+        foreach ($objects as $obj) {
+            if (is_null($targetClass)) {
+                $targetClass = get_class($obj);
+            }
+            $targetIds[] = $obj->id;
+        }
+        $criteria = $this->targetId->in($targetIds)
+            ->_AND_($this->targetClass->is($targetClass));
+
+        if (isset($sourceClass)) {
+            $this->joinSource($sourceClass);
+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        return $this->select($criteria);
+    }
+
+
+
+    /**
+     * delete all links to an object
+     *
+     * @param	app_Record		$object
+     * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes
+     * @param	bool			$deleteTarget	if set to true, the target will be deleted to
+     */
+    public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)
+    {
+        $set = clone $this;
+        $App = $object->App();
+
+        $criteria = $set->sourceId->is($object->id)->_AND_(
+            $set->sourceClass->is(get_class($object))
+        );
+
+        if (null !== $targetClass) {
+            $criteria = $criteria->_AND_(
+                $set->targetClass->is($targetClass)
+            );
+        }
+        if (null !== $linkType) {
+            $criteria = $criteria->_AND_(
+                $set->type->is($linkType)
+            );
+        }
+
+        if ($deleteTarget) {
+            foreach($set->select($criteria) as $link) {
+
+                $className = $link->targetClass.'Set';
+
+                // remove prefix
+
+                $className = mb_substr($className, 1 + mb_strpos($className, '_'));
+                $targetSet = $App->$className();
+
+                $targetSet->delete($targetSet->id->is($link->targetId));
+            }
+        }
+
+        return $set->delete($criteria);
+    }
 
 
     /**

programs/ui/ui.helpers.php

Indentation +260 added lines, -260 removed lines

@@ -33,50 +33,50 @@ 
  */
 function app_genericSetEditor(ORM_RecordSet $set)
 {
-	$O = bab_functionality::get('LibOrm');
-	$O->init();
-	$W = bab_Widgets();
-	$layout = $W->VBoxLayout();
-	$layout->setVerticalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORM_DateField) {
-			$widget = $W->DatePicker();
-		} else if ($field instanceof ORM_TimeField) {
-			$widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-		} else if ($field instanceof ORM_StringField) {
-			$widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
-		} else if ($field instanceof ORM_EnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORM_IntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORM_TextField) {
-			$widget = $W->TextEdit()->setColumns(80)->setLines(5);
-		} else if ($field instanceof ORM_RecordSet) {
-				$widget = app_genericSetEditor($field);
-				$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = bab_functionality::get('LibOrm');
+    $O->init();
+    $W = bab_Widgets();
+    $layout = $W->VBoxLayout();
+    $layout->setVerticalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORM_DateField) {
+            $widget = $W->DatePicker();
+        } else if ($field instanceof ORM_TimeField) {
+            $widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+        } else if ($field instanceof ORM_StringField) {
+            $widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
+        } else if ($field instanceof ORM_EnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORM_IntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORM_TextField) {
+            $widget = $W->TextEdit()->setColumns(80)->setLines(5);
+        } else if ($field instanceof ORM_RecordSet) {
+                $widget = app_genericSetEditor($field);
+                $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -89,50 +89,50 @@ 
  */
 function app_genericSetFilterForm(ORM_RecordSet $set)
 {
-	$O = bab_functionality::get('LibOrm');
-	$O->init();
-	$W = bab_Widgets();
-	$layout = $W->FlowLayout();
-	$layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORM_DateField) {
-			$widget = $W->PeriodPicker();
-		} else if ($field instanceof ORM_TimeField) {
-			$widget = $W->TimePicker();
-		} else if ($field instanceof ORM_StringField) {
-			$widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
-		} else if ($field instanceof ORM_EnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORM_IntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORM_TextField) {
-			$widget = $widget = $W->LineEdit()->setSize(15);
-		} else if ($field instanceof ORM_RecordSet) {
-			$widget = app_genericSetFilterForm($field);
-			$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = bab_functionality::get('LibOrm');
+    $O->init();
+    $W = bab_Widgets();
+    $layout = $W->FlowLayout();
+    $layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORM_DateField) {
+            $widget = $W->PeriodPicker();
+        } else if ($field instanceof ORM_TimeField) {
+            $widget = $W->TimePicker();
+        } else if ($field instanceof ORM_StringField) {
+            $widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
+        } else if ($field instanceof ORM_EnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORM_IntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORM_TextField) {
+            $widget = $widget = $W->LineEdit()->setSize(15);
+        } else if ($field instanceof ORM_RecordSet) {
+            $widget = app_genericSetFilterForm($field);
+            $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -145,47 +145,47 @@ 
  */
 function app_LabelledWidget($labelText, Widget_Displayable_Interface $widget)
 {
-	$W = bab_Widgets();
-
-	$label = $W->Label($labelText);
-	if ($widget instanceof Widget_InputWidget) {
-		$label->setAssociatedWidget($widget);
-	}
-
-	if ($widget instanceof Widget_CheckBox) {
-		$layout = $W->HBoxItems(
-			$widget->setSizePolicy(Widget_SizePolicy::MINIMUM),
-			$label
-		)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
-	} else {
-		$layout = $W->VBoxItems(
-			$label,
-			$widget
-		)->setVerticalSpacing(0.5, 'em');
-	}
-
-	return $layout;
+    $W = bab_Widgets();
+
+    $label = $W->Label($labelText);
+    if ($widget instanceof Widget_InputWidget) {
+        $label->setAssociatedWidget($widget);
+    }
+
+    if ($widget instanceof Widget_CheckBox) {
+        $layout = $W->HBoxItems(
+            $widget->setSizePolicy(Widget_SizePolicy::MINIMUM),
+            $label
+        )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    } else {
+        $layout = $W->VBoxItems(
+            $label,
+            $widget
+        )->setVerticalSpacing(0.5, 'em');
+    }
+
+    return $layout;
 }
 
 
 
 function app_LabelledCheckbox($labelText, $checkboxName, $options = null)
 {
-	$W = bab_Widgets();
+    $W = bab_Widgets();
 
-	$label = $W->Label($labelText)->colon(false);
-	$checkbox = $W->Checkbox()->setName($checkboxName);
-	$label->setAssociatedWidget($checkbox);
-	if (isset($options)) {
-		$label->setSizePolicy(Widget_SizePolicy::FIXED)->setCanvasOptions($options);
-	}
+    $label = $W->Label($labelText)->colon(false);
+    $checkbox = $W->Checkbox()->setName($checkboxName);
+    $label->setAssociatedWidget($checkbox);
+    if (isset($options)) {
+        $label->setSizePolicy(Widget_SizePolicy::FIXED)->setCanvasOptions($options);
+    }
 
-	$layout = $W->HBoxItems(
-					$checkbox->setSizePolicy(Widget_SizePolicy::MINIMUM),
-					$label
-				)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    $layout = $W->HBoxItems(
+                    $checkbox->setSizePolicy(Widget_SizePolicy::MINIMUM),
+                    $label
+                )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
 
-	return $layout;
+    return $layout;
 }
 
 
@@ -193,42 +193,42 @@ 
 
 function app_LabelledOrmSelect(ORM_MysqlIterator $iterator, $fieldName, $selectName, $label, $hidden = false, $groupFieldName = null)
 {
-	$W = bab_Widgets();
-
-	if (isset($groupFieldName)) {
-		$groupPathElements = explode('/', $groupFieldName);
-	}
-
-	$select = $W->Select()->setName($selectName);
-
-	$select->addOption('', '');
-
-	$nbOptions = 0;
-	foreach ($iterator as $record) {
-		if (isset($record->code)) {
-			$optionText = $record->code . ' - ' . $record->$fieldName;
-		} else {
-			$optionText = $record->$fieldName;
-		}
-		if (isset($groupFieldName)) {
-			$group = $record;
-			foreach ($groupPathElements as $groupPathElement) {
-				$group = $group->$groupPathElement;
-			}
-			$select->addOption($record->id, $optionText, $group);
-		} else {
-			$select->addOption($record->id, $optionText);
-		}
-		$nbOptions++;
-		$lastId = $record->id;
-	}
-
-	if ($nbOptions == 1) {
-		$select->setValue($lastId);
-	}
-
-
-	return app_LabelledWidget($label, $select);
+    $W = bab_Widgets();
+
+    if (isset($groupFieldName)) {
+        $groupPathElements = explode('/', $groupFieldName);
+    }
+
+    $select = $W->Select()->setName($selectName);
+
+    $select->addOption('', '');
+
+    $nbOptions = 0;
+    foreach ($iterator as $record) {
+        if (isset($record->code)) {
+            $optionText = $record->code . ' - ' . $record->$fieldName;
+        } else {
+            $optionText = $record->$fieldName;
+        }
+        if (isset($groupFieldName)) {
+            $group = $record;
+            foreach ($groupPathElements as $groupPathElement) {
+                $group = $group->$groupPathElement;
+            }
+            $select->addOption($record->id, $optionText, $group);
+        } else {
+            $select->addOption($record->id, $optionText);
+        }
+        $nbOptions++;
+        $lastId = $record->id;
+    }
+
+    if ($nbOptions == 1) {
+        $select->setValue($lastId);
+    }
+
+
+    return app_LabelledWidget($label, $select);
 }
 
 
@@ -236,108 +236,108 @@ 
 
 function app_OrmWidget(ORM_Field $field)
 {
-	$W = bab_Widgets();
+    $W = bab_Widgets();
 
 
-	if ($field instanceof ORM_DateField) {
-		$widget = $W->DatePicker();
-	} else if ($field instanceof ORM_TimeField) {
-		$widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORM_DatetimeField) {
-	    $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORM_EnumField) {
-		$widget = $W->Select();
+    if ($field instanceof ORM_DateField) {
+        $widget = $W->DatePicker();
+    } else if ($field instanceof ORM_TimeField) {
+        $widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORM_DatetimeField) {
+        $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORM_EnumField) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
-		$widget->addOption('', '');
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORM_SetField) {
-		$widget = $W->MultiSelect()->setSelectedList(2);
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORM_UserField) {
-	    $widget = $W->SuggestUser()
-    	    ->setMinChars(0)
-    	    ->setSizePolicy(Func_Icons::ICON_LEFT_16);
-	} else if ($field instanceof ORM_CurrencyField) {
-		$widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
-	} else if ($field instanceof ORM_BoolField) {
-		$widget = $W->CheckBox()->setCheckedValue('1');
-	} else if ($field instanceof ORM_IntField) {
-		$widget = $W->LineEdit()
-						->setSize(6)->addClass('widget-input-numeric');
-	} else if ($field instanceof ORM_EmailField) {
-		$widget = $W->EmailLineEdit()
-						->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORM_FileField) {
-	    $widget = $W->FilePicker();
-	} else if ($field instanceof ORM_StringField) {
-		$widget = $W->LineEdit()
-			->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORM_TextField) {
-		$widget = $W->TextEdit()
-		  ->addClass('widget-autoresize');
-	} else if ($field instanceof ORM_PkField) {
-	    $widget = $W->Hidden();
-	} else if ($field instanceof ORM_FkField) {
-		$widget = $W->Select();
-		$fieldName = $field->getName();
-		$parentSet = clone $field->getParentSet();
-		$parentSet->join($fieldName);
-		$set = $parentSet->$fieldName;
-		$records = $set->select();
-		$records->orderAsc($set->name);
-		$pkName = $set->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else if ($field instanceof ORM_RecordSet) {
-		$widget = $W->Select();
+        $widget->addOption('', '');
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORM_SetField) {
+        $widget = $W->MultiSelect()->setSelectedList(2);
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORM_UserField) {
+        $widget = $W->SuggestUser()
+            ->setMinChars(0)
+            ->setSizePolicy(Func_Icons::ICON_LEFT_16);
+    } else if ($field instanceof ORM_CurrencyField) {
+        $widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
+    } else if ($field instanceof ORM_BoolField) {
+        $widget = $W->CheckBox()->setCheckedValue('1');
+    } else if ($field instanceof ORM_IntField) {
+        $widget = $W->LineEdit()
+                        ->setSize(6)->addClass('widget-input-numeric');
+    } else if ($field instanceof ORM_EmailField) {
+        $widget = $W->EmailLineEdit()
+                        ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORM_FileField) {
+        $widget = $W->FilePicker();
+    } else if ($field instanceof ORM_StringField) {
+        $widget = $W->LineEdit()
+            ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORM_TextField) {
+        $widget = $W->TextEdit()
+            ->addClass('widget-autoresize');
+    } else if ($field instanceof ORM_PkField) {
+        $widget = $W->Hidden();
+    } else if ($field instanceof ORM_FkField) {
+        $widget = $W->Select();
+        $fieldName = $field->getName();
+        $parentSet = clone $field->getParentSet();
+        $parentSet->join($fieldName);
+        $set = $parentSet->$fieldName;
+        $records = $set->select();
+        $records->orderAsc($set->name);
+        $pkName = $set->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else if ($field instanceof ORM_RecordSet) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
 //		$fieldName = $field->getName();
 //		$parentSet = $field->getParentSet();
 //		$parentSet->join($fieldName);
 //		$set = $parentSet->$fieldName;
-		$records = $field->select();
-		$records->orderAsc($field->name);
-		$pkName = $field->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else {
-		$widget = $W->LineEdit();
-	}
-
-	$widget->setName($field->getName());
-
-	return $widget;
+        $records = $field->select();
+        $records->orderAsc($field->name);
+        $pkName = $field->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else {
+        $widget = $W->LineEdit();
+    }
+
+    $widget->setName($field->getName());
+
+    return $widget;
 }
 
 
 
 function app_LabelledOrmWidget(ORM_Field $field, $label = null, $hidden = false)
 {
-	$W = bab_Widgets();
+    $W = bab_Widgets();
 
-	if ($hidden) {
-		$widget = $W->Hidden();
-		$widget->setName($field->getName());
-		return $widget;
-	}
+    if ($hidden) {
+        $widget = $W->Hidden();
+        $widget->setName($field->getName());
+        return $widget;
+    }
 
-	if (is_null($label)) {
-		$label = $field->getDescription();
-	}
+    if (is_null($label)) {
+        $label = $field->getDescription();
+    }
 
-	$widget = app_OrmWidget($field);
+    $widget = app_OrmWidget($field);
 
-	return app_LabelledWidget($label, $widget);
+    return app_LabelledWidget($label, $widget);
 }
 
 
@@ -353,16 +353,16 @@ 
  */
 function app_dateTime(ORM_Field $field, $value) {
 
-	$W = bab_functionality::get('Widgets');
-	$name = $field->getName();
-	$label = $W->Label($field->getDescription());
+    $W = bab_functionality::get('Widgets');
+    $name = $field->getName();
+    $label = $W->Label($field->getDescription());
 
-	$frame = app_dateTimeField($name, $label, $value);
+    $frame = app_dateTimeField($name, $label, $value);
 
-	return $W->VBoxItems(
-		$label,
-		$frame
-	);
+    return $W->VBoxItems(
+        $label,
+        $frame
+    );
 
 }
 
@@ -376,24 +376,24 @@ 
  */
 function app_dateTimeField($fieldName, Widget_Label $label, $value = null)
 {
-	$W = bab_functionality::get('Widgets');
+    $W = bab_functionality::get('Widgets');
 
-	$datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
-	$timepart = $W->TimePicker()->setName('time');
+    $datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
+    $timepart = $W->TimePicker()->setName('time');
 
-	if (isset($value)) {
+    if (isset($value)) {
 
-		$value = explode(' ', $value);
+        $value = explode(' ', $value);
 
-		$datepart->setValue($value[0]);
-		$timepart->setValue($value[1]);
-	}
+        $datepart->setValue($value[0]);
+        $timepart->setValue($value[1]);
+    }
 
-	$datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
-			->addItem($datepart)
-			->addItem($timepart);
+    $datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
+            ->addItem($datepart)
+            ->addItem($timepart);
 
-	return $datetime;
+    return $datetime;
 }
 
 

programs/customfield.ctrl.php

Indentation +92 added lines, -92 removed lines

@@ -86,122 +86,122 @@
 
 
 
-	/**
-	 * @return Widget_Page
-	 */
-	public function edit($customfield = null)
-	{
-		$W = bab_Widgets();
-		$App = $this->App();
-		$Ui = $App->Ui();
-		$page = $Ui->Page();
+    /**
+     * @return Widget_Page
+     */
+    public function edit($customfield = null)
+    {
+        $W = bab_Widgets();
+        $App = $this->App();
+        $Ui = $App->Ui();
+        $page = $Ui->Page();
 
-		$page->addClass('app-page-editor');
-		$page->setTitle($App->translate('Edit custom field'));
+        $page->addClass('app-page-editor');
+        $page->setTitle($App->translate('Edit custom field'));
 
-		if (null !== $customfield) {
-		    $set = $App->CustomFieldSet();
-			$customfield = $set->request($customfield);
-		}
+        if (null !== $customfield) {
+            $set = $App->CustomFieldSet();
+            $customfield = $set->request($customfield);
+        }
 
-		$form = $Ui->CustomFieldEditor($customfield);
+        $form = $Ui->CustomFieldEditor($customfield);
 
-		$page->addItem($form);
+        $page->addItem($form);
 
-		if ($customfield instanceof app_CustomField) {
-			$actionsFrame = $page->ActionsFrame();
-			$page->addContextItem($actionsFrame);
+        if ($customfield instanceof app_CustomField) {
+            $actionsFrame = $page->ActionsFrame();
+            $page->addContextItem($actionsFrame);
 
-			$actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));
-		}
+            $actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));
+        }
 
-		return $page;
-	}
+        return $page;
+    }
 
 
-	/**
-	 * @return bool
-	 */
-	public function save($customfield = null)
-	{
-	    $App = $this->App();
+    /**
+     * @return bool
+     */
+    public function save($customfield = null)
+    {
+        $App = $this->App();
 
-	    $set = $App->CustomFieldSet();
+        $set = $App->CustomFieldSet();
 
-		if (empty($customfield['id'])) {
-			$record = $set->newRecord();
-		} else {
-			$record = $set->get($customfield['id']);
-		}
+        if (empty($customfield['id'])) {
+            $record = $set->newRecord();
+        } else {
+            $record = $set->get($customfield['id']);
+        }
 
-		if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {
-		    $enumvalues = array();
-		    foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {
-		        $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);
-		    }
-			$record->enumvalues = serialize($enumvalues);
-		} else {
-			$record->enumvalues = '';
-		}
+        if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {
+            $enumvalues = array();
+            foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {
+                $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);
+            }
+            $record->enumvalues = serialize($enumvalues);
+        } else {
+            $record->enumvalues = '';
+        }
 
-		unset($customfield['enumvalues']);
-		$record->setFormInputValues($customfield);
+        unset($customfield['enumvalues']);
+        $record->setFormInputValues($customfield);
 
-		$record->save();
+        $record->save();
 
-		// refresh target table structure
+        // refresh target table structure
 
-		$object = $record->object.'Set';
-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
+        $object = $record->object.'Set';
+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
 
-		$recordSet = $App->$object();
-		if (method_exists($recordSet, 'useLang')) {
-		    // This is necessary if the recordSet constructor uses a setLang().
-		    // We need to revert to multilang fields before synchronizing.
-		    $recordSet->useLang(false);
-		}
+        $recordSet = $App->$object();
+        if (method_exists($recordSet, 'useLang')) {
+            // This is necessary if the recordSet constructor uses a setLang().
+            // We need to revert to multilang fields before synchronizing.
+            $recordSet->useLang(false);
+        }
 
-		$sql = $mysqlbackend->setToSql($recordSet);
+        $sql = $mysqlbackend->setToSql($recordSet);
 
-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
-		$synchronize = new bab_synchronizeSql();
-		$synchronize->fromSqlString($sql);
+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+        $synchronize = new bab_synchronizeSql();
+        $synchronize->fromSqlString($sql);
 
-		return true;
-	}
+        return true;
+    }
 
 
     /**
      * {@inheritDoc}
      * @see app_CtrlRecord::delete()
      */
-	public function delete($customfield)
-	{
-	    $App = $this->App();
-
-	    if (!$customfield) {
-		    throw new app_AccessException($App->translate('Access denied'));
-		}
-
-		$set = $App->CustomFieldSet();
-		$record = $set->request($customfield);
-		$object = $record->object.'Set';
-		$set->delete($set->id->is($customfield));
-
-		$recordSet = $App->$object();
-		if (method_exists($recordSet, 'useLang')) {
-		    // This is necessary if the recordSet constructor uses a setLang().
-		    // We need to revert to multilang fields before synchronizing.
-		    $recordSet->useLang(false);
-		}
-
-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
-		$sql = $mysqlbackend->setToSql($recordSet);
-
-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
-		$synchronize = new bab_synchronizeSql();
-		$synchronize->fromSqlString($sql);
-
-		return true;
-	}
+    public function delete($customfield)
+    {
+        $App = $this->App();
+
+        if (!$customfield) {
+            throw new app_AccessException($App->translate('Access denied'));
+        }
+
+        $set = $App->CustomFieldSet();
+        $record = $set->request($customfield);
+        $object = $record->object.'Set';
+        $set->delete($set->id->is($customfield));
+
+        $recordSet = $App->$object();
+        if (method_exists($recordSet, 'useLang')) {
+            // This is necessary if the recordSet constructor uses a setLang().
+            // We need to revert to multilang fields before synchronizing.
+            $recordSet->useLang(false);
+        }
+
+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
+        $sql = $mysqlbackend->setToSql($recordSet);
+
+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+        $synchronize = new bab_synchronizeSql();
+        $synchronize->fromSqlString($sql);
+
+        return true;
+    }
 }

programs/customfield.class.php

Indentation +143 added lines, -143 removed lines

@@ -46,72 +46,72 @@ 
     /**
      * @param Func_App $App
      */
-	public function __construct(Func_App $App)
-	{
-		parent::__construct($App);
-
-		$this->setDescription('Custom field');
-
-		$this->setPrimaryKey('id');
-
-		$this->addFields(
-			ORM_StringField('name')
-				->setDescription('Name of field used for display'),
-			ORM_StringField('fieldname')
-				->setDescription('Name of field used in table, not modifiable'),
-			ORM_TextField('description')
-				->setDescription('Optional description'),
-			ORM_EnumField('object', $this->getObjects())
-				->setDescription('Name of object in App ex : Article, Contact, Organization...'),
-			ORM_EnumField('fieldtype', $this->getFieldTypes())
-				->setDescription('Name of ORM field ex : Enum, String, Text, Bool...'),
-			ORM_TextField('enumvalues')
-				->setDescription('serialized array of values for enum fields'),
-			ORM_BoolField('mandatory')
-				->setDescription('Mandatory')
-		);
-	}
-
-
-
-	/**
-	 * List of objects where custom fields are applicable.
-	 *
-	 * @return string[]
-	 */
-	public function getObjects()
-	{
-		$App = $this->App();
-
-		$arr = array();
-
-		if (isset($App->Article)) {
-			$arr['Article'] = $App->translate('Products database');
-		}
-
-		return $arr;
-	}
-
-	/**
-	 * list of ORM fields to use for a custom field
-	 */
-	public function getFieldTypes()
-	{
-		$App = $this->App();
-
-		return array(
-			'String' 	=> $App->translate('Line edit'),
-			'Text'		=> $App->translate('Text edit'),
-			'Bool'		=> $App->translate('Checkbox'),
-			'Int'		=> $App->translate('Integer number'),
-			'Decimal'	=> $App->translate('Decimal number'),
-			'Date'		=> $App->translate('Date'),
-			'DateTime'	=> $App->translate('Date and time'),
-			'Enum' 		=> $App->translate('Selection list'),
-			'Url' 		=> $App->translate('Url'),
-			'Email' 	=> $App->translate('Email address'),
-		);
-	}
+    public function __construct(Func_App $App)
+    {
+        parent::__construct($App);
+
+        $this->setDescription('Custom field');
+
+        $this->setPrimaryKey('id');
+
+        $this->addFields(
+            ORM_StringField('name')
+                ->setDescription('Name of field used for display'),
+            ORM_StringField('fieldname')
+                ->setDescription('Name of field used in table, not modifiable'),
+            ORM_TextField('description')
+                ->setDescription('Optional description'),
+            ORM_EnumField('object', $this->getObjects())
+                ->setDescription('Name of object in App ex : Article, Contact, Organization...'),
+            ORM_EnumField('fieldtype', $this->getFieldTypes())
+                ->setDescription('Name of ORM field ex : Enum, String, Text, Bool...'),
+            ORM_TextField('enumvalues')
+                ->setDescription('serialized array of values for enum fields'),
+            ORM_BoolField('mandatory')
+                ->setDescription('Mandatory')
+        );
+    }
+
+
+
+    /**
+     * List of objects where custom fields are applicable.
+     *
+     * @return string[]
+     */
+    public function getObjects()
+    {
+        $App = $this->App();
+
+        $arr = array();
+
+        if (isset($App->Article)) {
+            $arr['Article'] = $App->translate('Products database');
+        }
+
+        return $arr;
+    }
+
+    /**
+     * list of ORM fields to use for a custom field
+     */
+    public function getFieldTypes()
+    {
+        $App = $this->App();
+
+        return array(
+            'String' 	=> $App->translate('Line edit'),
+            'Text'		=> $App->translate('Text edit'),
+            'Bool'		=> $App->translate('Checkbox'),
+            'Int'		=> $App->translate('Integer number'),
+            'Decimal'	=> $App->translate('Decimal number'),
+            'Date'		=> $App->translate('Date'),
+            'DateTime'	=> $App->translate('Date and time'),
+            'Enum' 		=> $App->translate('Selection list'),
+            'Url' 		=> $App->translate('Url'),
+            'Email' 	=> $App->translate('Email address'),
+        );
+    }
 
     /**
      * @return ORM_Criteria
@@ -175,7 +175,7 @@ 
             case 'Bool':
                 $field = ORM_BoolField($this->fieldname);
                 $field->setOutputOptions(
-                       $this->App()->translate('No'),
+                        $this->App()->translate('No'),
                     $this->App()->translate('Yes')
                 );
                 break;
@@ -192,80 +192,80 @@ 
     }
 
 
-	/**
-	 * @return string[]
-	 */
-	public function getEnumValues()
-	{
-	    return unserialize($this->enumvalues);
-	}
-
-
-	/**
-	 * @return Widget_LabelledWidget
-	 */
-	public function getWidget()
-	{
-		$W = bab_Widgets();
-		$App = $this->App();
-
-		switch ($this->fieldtype) {
-			case 'Text':
-				$widget = $W->TextEdit()->setLines(3)->setColumns(70);
-				break;
-
-			case 'Bool':
-				$widget = $W->Checkbox();
-				break;
-
-			case 'Enum':
-				$options = array('' => '') + $this->getEnumValues();
-				$widget = $W->Select()->setOptions($options);
-				break;
-
-			case 'Date':
-				$widget = $W->DatePicker();
-				break;
-
-			case 'DateTime':
-				$widget = $W->DateTimePicker();
-				break;
-
-			case 'Int':
-				$widget = $W->RegExpLineEdit();
-				$widget->setRegExp(Widget_RegExpLineEdit::INT_FORMAT)
-					->setSubmitMessage(sprintf($App->translate('The field %s should be a integer number'), $this->name))
-					->setSize(10);
-				break;
-
-			case 'Decimal':
-				$widget = $W->RegExpLineEdit();
-				$widget->setRegExp(Widget_RegExpLineEdit::FLOAT_FORMAT)
-					->setSubmitMessage(sprintf($App->translate('The field %s should be a decimal number'), $this->name))
-					->setSize(10);
-				break;
-
-			case 'Url':
-				$widget = $W->UrlLineEdit();
-				break;
-
-			case 'Email':
-				$widget = $W->EmailLineEdit();
-				break;
-
-			default:
-			case 'String':
-				$widget = $W->LineEdit()->setSize(70)->setMaxSize(255);
-				break;
-		}
-
-		$labelledItem = $W->LabelledWidget($this->name, $widget, null);
-		$labelledItem->setName($this->fieldname);
-
-		if (!empty($this->description)) {
-			$labelledItem->setDescription($this->description);
-		}
-
-		return $labelledItem;
-	}
+    /**
+     * @return string[]
+     */
+    public function getEnumValues()
+    {
+        return unserialize($this->enumvalues);
+    }
+
+
+    /**
+     * @return Widget_LabelledWidget
+     */
+    public function getWidget()
+    {
+        $W = bab_Widgets();
+        $App = $this->App();
+
+        switch ($this->fieldtype) {
+            case 'Text':
+                $widget = $W->TextEdit()->setLines(3)->setColumns(70);
+                break;
+
+            case 'Bool':
+                $widget = $W->Checkbox();
+                break;
+
+            case 'Enum':
+                $options = array('' => '') + $this->getEnumValues();
+                $widget = $W->Select()->setOptions($options);
+                break;
+
+            case 'Date':
+                $widget = $W->DatePicker();
+                break;
+
+            case 'DateTime':
+                $widget = $W->DateTimePicker();
+                break;
+
+            case 'Int':
+                $widget = $W->RegExpLineEdit();
+                $widget->setRegExp(Widget_RegExpLineEdit::INT_FORMAT)
+                    ->setSubmitMessage(sprintf($App->translate('The field %s should be a integer number'), $this->name))
+                    ->setSize(10);
+                break;
+
+            case 'Decimal':
+                $widget = $W->RegExpLineEdit();
+                $widget->setRegExp(Widget_RegExpLineEdit::FLOAT_FORMAT)
+                    ->setSubmitMessage(sprintf($App->translate('The field %s should be a decimal number'), $this->name))
+                    ->setSize(10);
+                break;
+
+            case 'Url':
+                $widget = $W->UrlLineEdit();
+                break;
+
+            case 'Email':
+                $widget = $W->EmailLineEdit();
+                break;
+
+            default:
+            case 'String':
+                $widget = $W->LineEdit()->setSize(70)->setMaxSize(255);
+                break;
+        }
+
+        $labelledItem = $W->LabelledWidget($this->name, $widget, null);
+        $labelledItem->setName($this->fieldname);
+
+        if (!empty($this->description)) {
+            $labelledItem->setDescription($this->description);
+        }
+
+        return $labelledItem;
+    }
 }