capwelton / libapp

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 = null)
-	{
-		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 = null)
+    {
+        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;
+    }
 }

programs/record.ctrl.php

Spacing +41 added lines, -41 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2006 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once dirname(__FILE__) . '/controller.class.php';
+require_once dirname(__FILE__).'/controller.class.php';
 
 
 
@@ -52,7 +52,7 @@ 
     {
         $App = $this->App();
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
 
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -103,7 +103,7 @@ 
             if ($showLabel) {
                 $text = $actions->getTitle();
             }
-            $html = '<li><a class="icon ' . $actions->getIcon() .  '"href="' . $actions->url() . '">' . $text . '</a></li>';
+            $html = '<li><a class="icon '.$actions->getIcon().'"href="'.$actions->url().'">'.$text.'</a></li>';
         } elseif (is_array($actions)) {
             if (isset($actions['items'])) {
                 $items = $actions['items'];
@@ -116,10 +116,10 @@ 
             if (isset($actions['icon'])) {
 
                 $html = '<li class="dropdown">'
-                    . '<a href="#" class="' . $actions['icon'] . ' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
+                    . '<a href="#" class="'.$actions['icon'].' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
                     . ($actions['icon'] === 'actions-context-menu'/*Func_Icons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>')
                     . '</a>'
-                    . '<ul class="dropdown-menu dropdown-menu-right ' . Func_Icons::ICON_LEFT_SYMBOLIC . '">'
+                    . '<ul class="dropdown-menu dropdown-menu-right '.Func_Icons::ICON_LEFT_SYMBOLIC.'">'
                     . $html
                     . '</ul>';
             }
@@ -142,7 +142,7 @@ 
 
         $recordClassname = $this->getRecordClassName();
 
-        $viewClassname =  $recordClassname . 'TableView';
+        $viewClassname = $recordClassname.'TableView';
         if (method_exists($Ui, $viewClassname)) {
             $types['table'] = array(
                 'classname' => $viewClassname,
@@ -151,7 +151,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CardsView';
+        $viewClassname = $recordClassname.'CardsView';
         if (method_exists($Ui, $viewClassname)) {
             $types['cards'] = array(
                 'classname' => $viewClassname,
@@ -160,7 +160,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'MapView';
+        $viewClassname = $recordClassname.'MapView';
         if (method_exists($Ui, $viewClassname)) {
             $types['map'] = array(
                 'classname' => $viewClassname,
@@ -169,7 +169,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CalendarView';
+        $viewClassname = $recordClassname.'CalendarView';
         if (method_exists($Ui, $viewClassname)) {
             $types['calendar'] = array(
                 'classname' => $viewClassname,
@@ -241,7 +241,7 @@ 
         foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
             foreach ($fields as $field) {
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
             }
         }
 
@@ -265,7 +265,7 @@ 
         bab_Sort::asort($availableFields, 'description', bab_Sort::CASE_INSENSITIVE);
 
         foreach ($availableFields as $field) {
-            $fieldName =  $field['name'];
+            $fieldName = $field['name'];
             $fieldDescription = $field['description'];
 
             $used = isset($allViewFieldNames[$fieldName]);
@@ -459,7 +459,7 @@ 
         $nbCol = 0;
         foreach ($customSections as $customSection) {
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
 //             if ($currentColumn + $nbCol > 12) {
 //                 $sectionsSection->addItem($row);
@@ -470,8 +470,8 @@ 
             $currentColumn += $nbCol;
 
             $sectionSection = $W->Section(
-                $customSection->name . ' (' . $customSection->rank . ')',
-                $sectionBox = $W->VBoxItems($W->Hidden()->setName('#' . $customSection->id))
+                $customSection->name.' ('.$customSection->rank.')',
+                $sectionBox = $W->VBoxItems($W->Hidden()->setName('#'.$customSection->id))
 //                     ->addClass('widget-dockable-content')
             );
             $sectionSection->addClass('crm-custom-section');
@@ -516,16 +516,16 @@ 
                 }
 
                 $fieldItem = $W->FlowItems(
-                    $W->Label($fieldDescription)->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-80pc' ),
+                    $W->Label($fieldDescription)->setSizePolicy(Func_Icons::ICON_LEFT_16.' widget-80pc'),
                     $W->FlowItems(
-                        $W->Hidden()->setName($customSection->id . '.' . $fieldId)->setValue($field['name']),
+                        $W->Hidden()->setName($customSection->id.'.'.$fieldId)->setValue($field['name']),
                         $W->Link('', $this->proxy()->editDisplayField($customSection->id, $field['name']))
                             ->addClass('icon', Func_Icons::ACTIONS_DOCUMENT_EDIT)
                             ->setOpenMode(Widget_Link::OPEN_DIALOG),
                         $W->Link('', $this->proxy()->removeDisplayField($customSection->id, $field['name']))
                             ->addClass('icon', Func_Icons::ACTIONS_LIST_REMOVE)
                             ->setAjaxAction()
-                    )->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-20pc widget-align-right widget-actions' )
+                    )->setSizePolicy(Func_Icons::ICON_LEFT_16.' widget-20pc widget-align-right widget-actions')
                 )->setSizePolicy('widget-list-element  widget-actions-target');
 
                 $sectionBox->addItem($fieldItem);
@@ -598,7 +598,7 @@ 
         }
 
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $objectName . '.' . ($view === '' ? 'default' : $view) . '.json"'."\n");
+        header('Content-Disposition: attachment; filename="'.$objectName.'.'.($view === '' ? 'default' : $view).'.json"'."\n");
 
         $json = bab_json_encode($sectionsValues);
         $json = bab_convertStringFromDatabase($json, bab_charset::UTF_8);
@@ -842,11 +842,11 @@ 
         $recordSet = $this->getEditRecordSet();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname.'SectionEditor';
         /* @var $editor app_RecordEditor */
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '.' . __FUNCTION__;
+            $itemId = $this->getClass().'.'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -889,7 +889,7 @@ 
     public function getModelViewDefaultId($itemId = null)
     {
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '.modelView';
+            $itemId = $this->getClass().'.modelView';
         }
 
         return $itemId;
@@ -923,20 +923,20 @@ 
 
         switch ($type) {
             case 'cards':
-                $tableviewClassname =  $recordClassname . 'CardsView';
+                $tableviewClassname = $recordClassname.'CardsView';
                 break;
 
             case 'map':
-                $tableviewClassname =  $recordClassname . 'MapView';
+                $tableviewClassname = $recordClassname.'MapView';
                 break;
 
             case 'calendar':
-                $tableviewClassname =  $recordClassname . 'CalendarView';
+                $tableviewClassname = $recordClassname.'CalendarView';
                 break;
 
             case 'table':
             default:
-                $tableviewClassname =  $recordClassname . 'TableView';
+                $tableviewClassname = $recordClassname.'TableView';
                 break;
         }
 
@@ -1002,10 +1002,10 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'Editor';
+        $editorClassname = $recordClassname.'Editor';
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -1050,7 +1050,7 @@ 
                     $W->Link(
                         '',
                         $proxy->setFilteredViewType($tableView->getId(), $viewTypeId)
-                    )->addClass('icon', $viewType['icon'] . ($filteredViewType=== $viewTypeId ? ' active' : ''))
+                    )->addClass('icon', $viewType['icon'].($filteredViewType === $viewTypeId ? ' active' : ''))
 //                    ->setSizePolicy('btn btn-xs btn-default ' . ($filteredViewType === $viewTypeId ? 'active' : ''))
                     ->setTitle($viewType['label'])
                     ->setAjaxAction()
@@ -1094,7 +1094,7 @@ 
 
         $filterVisibility = $this->getFilterVisibility($itemId);
         $filterVisibility = !$filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
 
         return true;
     }
@@ -1107,10 +1107,10 @@ 
     protected function getFilterVisibility($itemId)
     {
         $W = bab_Widgets();
-        $filterVisibility = $W->getUserConfiguration($itemId . '/filterVisibility');
+        $filterVisibility = $W->getUserConfiguration($itemId.'/filterVisibility');
         if (!isset($filterVisibility)) {
             $filterVisibility = false;
-            $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+            $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         }
         return $filterVisibility;
     }
@@ -1124,7 +1124,7 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
+        $type = $W->getUserConfiguration($itemId.'/viewType');
         if (!isset($type)) {
             $type = 'table';
         }
@@ -1140,7 +1140,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
 
         return true;
     }
@@ -1285,14 +1285,14 @@ 
 
         switch ($format) {
             case 'xlsx':
-                $tableview->downloadXlsx($filename . '.xlsx');
+                $tableview->downloadXlsx($filename.'.xlsx');
             case 'xls':
-                $tableview->downloadExcel($filename . '.xls');
+                $tableview->downloadExcel($filename.'.xls');
             case 'ssv':
-                $tableview->downloadCsv($filename . '.csv', ';', $inline, 'Windows-1252');
+                $tableview->downloadCsv($filename.'.csv', ';', $inline, 'Windows-1252');
             case 'csv':
             default:
-                $tableview->downloadCsv($filename . '.csv', ',', $inline, bab_charset::getIso());
+                $tableview->downloadCsv($filename.'.csv', ',', $inline, bab_charset::getIso());
         }
     }
 
@@ -1320,7 +1320,7 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $fullFrameClassname =  $recordClassname . 'FullFrame';
+        $fullFrameClassname = $recordClassname.'FullFrame';
         $fullFrame = $Ui->$fullFrameClassname($record, $view);
 
 
@@ -1483,7 +1483,7 @@ 
 
         $recordTitle = $record->getRecordTitle();
 
-        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"');
+        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"');
         return $message;
     }
 
@@ -1610,7 +1610,7 @@ 
             $this->addMessage($deletedMessage);
         }
 
-        $this->addReloadSelector('.depends-' . strtolower($record->getClassName()));
+        $this->addReloadSelector('.depends-'.strtolower($record->getClassName()));
 
         return true;
     }
@@ -1641,7 +1641,7 @@ 
 
         $recordTitle = $record->getRecordTitle();
 
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
 
         $form->addItem($W->Title($App->translate('Confirm delete?'), 6));