Passed
Branchfeature/useWidgetsNamespaces_c... (264d4b)
by Robin
04:22
created
programs/Ctrl/AppCtrlRecord.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2141,7 +2141,7 @@
 block discarded – undo
2141 2141
         }
2142 2142
     
2143 2143
         header("Content-type: application/json; charset=utf-8");
2144
-	    echo $collection->output();
2145
-	    die();
2144
+        echo $collection->output();
2145
+        die();
2146 2146
     }
2147 2147
 }
Please login to merge, or discard this patch.
programs/Ui/AppHelpers.php 1 patch
Indentation   +208 added lines, -208 removed lines patch added patch discarded remove patch
@@ -63,50 +63,50 @@  discard block
 block discarded – undo
63 63
 
64 64
 function app_genericSetEditor(ORMRecordSet $set)
65 65
 {
66
-	$O = BabFunctionality::get('LibOrm');
67
-	$O->init();
68
-	$W = bab_Widgets();
69
-	$layout = $W->VBoxLayout();
70
-	$layout->setVerticalSpacing(1, 'em');
71
-
72
-
73
-	$fields = $set->getFields();
74
-
75
-	foreach ($fields as $field) {
76
-		$description = $field->getDescription();
77
-		if (empty($description)) {
78
-			$description = $field->getName();
79
-		}
80
-		$fieldLabel = $W->Label($description . ':');
81
-
82
-		if ($field instanceof ORMDateField) {
83
-			$widget = $W->DatePicker();
84
-		} else if ($field instanceof ORMTimeField) {
85
-			$widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
86
-		} else if ($field instanceof ORMStringField) {
87
-			$widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
88
-		} else if ($field instanceof ORMEnumField) {
89
-			$widget = $W->Select();
90
-			$widget->addOption('', '');
91
-			foreach ($field->getValues() as $key => $text) {
92
-				$widget->addOption($key, $text);
93
-			}
94
-		} else if ($field instanceof ORMIntField) {
95
-			$widget = $W->LineEdit()->setSize(9);
96
-		} else if ($field instanceof ORMTextField) {
97
-			$widget = $W->TextEdit()->setColumns(80)->setLines(5);
98
-		} else if ($field instanceof ORMRecordSet) {
99
-				$widget = app_genericSetEditor($field);
100
-				$widget->addClass('sub-form');
101
-		} else {
102
-			$widget = null;
103
-		}
104
-		if (isset($widget)) {
105
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
106
-		}
107
-	}
108
-
109
-	return $layout;
66
+    $O = BabFunctionality::get('LibOrm');
67
+    $O->init();
68
+    $W = bab_Widgets();
69
+    $layout = $W->VBoxLayout();
70
+    $layout->setVerticalSpacing(1, 'em');
71
+
72
+
73
+    $fields = $set->getFields();
74
+
75
+    foreach ($fields as $field) {
76
+        $description = $field->getDescription();
77
+        if (empty($description)) {
78
+            $description = $field->getName();
79
+        }
80
+        $fieldLabel = $W->Label($description . ':');
81
+
82
+        if ($field instanceof ORMDateField) {
83
+            $widget = $W->DatePicker();
84
+        } else if ($field instanceof ORMTimeField) {
85
+            $widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
86
+        } else if ($field instanceof ORMStringField) {
87
+            $widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
88
+        } else if ($field instanceof ORMEnumField) {
89
+            $widget = $W->Select();
90
+            $widget->addOption('', '');
91
+            foreach ($field->getValues() as $key => $text) {
92
+                $widget->addOption($key, $text);
93
+            }
94
+        } else if ($field instanceof ORMIntField) {
95
+            $widget = $W->LineEdit()->setSize(9);
96
+        } else if ($field instanceof ORMTextField) {
97
+            $widget = $W->TextEdit()->setColumns(80)->setLines(5);
98
+        } else if ($field instanceof ORMRecordSet) {
99
+                $widget = app_genericSetEditor($field);
100
+                $widget->addClass('sub-form');
101
+        } else {
102
+            $widget = null;
103
+        }
104
+        if (isset($widget)) {
105
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
106
+        }
107
+    }
108
+
109
+    return $layout;
110 110
 }
111 111
 
112 112
 
@@ -119,50 +119,50 @@  discard block
 block discarded – undo
119 119
  */
120 120
 function app_genericSetFilterForm(ORMRecordSet $set)
121 121
 {
122
-	$O = BabFunctionality::get('LibOrm');
123
-	$O->init();
124
-	$W = bab_Widgets();
125
-	$layout = $W->FlowLayout();
126
-	$layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
127
-
128
-
129
-	$fields = $set->getFields();
130
-
131
-	foreach ($fields as $field) {
132
-		$description = $field->getDescription();
133
-		if (empty($description)) {
134
-			$description = $field->getName();
135
-		}
136
-		$fieldLabel = $W->Label($description . ':');
137
-
138
-		if ($field instanceof ORMDateField) {
139
-			$widget = $W->PeriodPicker();
140
-		} else if ($field instanceof ORMTimeField) {
141
-			$widget = $W->TimePicker();
142
-		} else if ($field instanceof ORMStringField) {
143
-			$widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
144
-		} else if ($field instanceof ORMEnumField) {
145
-			$widget = $W->Select();
146
-			$widget->addOption('', '');
147
-			foreach ($field->getValues() as $key => $text) {
148
-				$widget->addOption($key, $text);
149
-			}
150
-		} else if ($field instanceof ORMIntField) {
151
-			$widget = $W->LineEdit()->setSize(9);
152
-		} else if ($field instanceof ORMTextField) {
153
-			$widget = $widget = $W->LineEdit()->setSize(15);
154
-		} else if ($field instanceof ORMRecordSet) {
155
-			$widget = app_genericSetFilterForm($field);
156
-			$widget->addClass('sub-form');
157
-		} else {
158
-			$widget = null;
159
-		}
160
-		if (isset($widget)) {
161
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
162
-		}
163
-	}
164
-
165
-	return $layout;
122
+    $O = BabFunctionality::get('LibOrm');
123
+    $O->init();
124
+    $W = bab_Widgets();
125
+    $layout = $W->FlowLayout();
126
+    $layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
127
+
128
+
129
+    $fields = $set->getFields();
130
+
131
+    foreach ($fields as $field) {
132
+        $description = $field->getDescription();
133
+        if (empty($description)) {
134
+            $description = $field->getName();
135
+        }
136
+        $fieldLabel = $W->Label($description . ':');
137
+
138
+        if ($field instanceof ORMDateField) {
139
+            $widget = $W->PeriodPicker();
140
+        } else if ($field instanceof ORMTimeField) {
141
+            $widget = $W->TimePicker();
142
+        } else if ($field instanceof ORMStringField) {
143
+            $widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
144
+        } else if ($field instanceof ORMEnumField) {
145
+            $widget = $W->Select();
146
+            $widget->addOption('', '');
147
+            foreach ($field->getValues() as $key => $text) {
148
+                $widget->addOption($key, $text);
149
+            }
150
+        } else if ($field instanceof ORMIntField) {
151
+            $widget = $W->LineEdit()->setSize(9);
152
+        } else if ($field instanceof ORMTextField) {
153
+            $widget = $widget = $W->LineEdit()->setSize(15);
154
+        } else if ($field instanceof ORMRecordSet) {
155
+            $widget = app_genericSetFilterForm($field);
156
+            $widget->addClass('sub-form');
157
+        } else {
158
+            $widget = null;
159
+        }
160
+        if (isset($widget)) {
161
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
162
+        }
163
+    }
164
+
165
+    return $layout;
166 166
 }
167 167
 
168 168
 
@@ -175,47 +175,47 @@  discard block
 block discarded – undo
175 175
  */
176 176
 function app_LabelledWidget($labelText, WidgetDisplayableInterface $widget)
177 177
 {
178
-	$W = bab_Widgets();
179
-
180
-	$label = $W->Label($labelText);
181
-	if ($widget instanceof WidgetInputWidget) {
182
-		$label->setAssociatedWidget($widget);
183
-	}
184
-
185
-	if ($widget instanceof WidgetCheckBox) {
186
-		$layout = $W->HBoxItems(
187
-			$widget->setSizePolicy(WidgetSizePolicy::MINIMUM),
188
-			$label
189
-		)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
190
-	} else {
191
-		$layout = $W->VBoxItems(
192
-			$label,
193
-			$widget
194
-		)->setVerticalSpacing(0.5, 'em');
195
-	}
196
-
197
-	return $layout;
178
+    $W = bab_Widgets();
179
+
180
+    $label = $W->Label($labelText);
181
+    if ($widget instanceof WidgetInputWidget) {
182
+        $label->setAssociatedWidget($widget);
183
+    }
184
+
185
+    if ($widget instanceof WidgetCheckBox) {
186
+        $layout = $W->HBoxItems(
187
+            $widget->setSizePolicy(WidgetSizePolicy::MINIMUM),
188
+            $label
189
+        )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
190
+    } else {
191
+        $layout = $W->VBoxItems(
192
+            $label,
193
+            $widget
194
+        )->setVerticalSpacing(0.5, 'em');
195
+    }
196
+
197
+    return $layout;
198 198
 }
199 199
 
200 200
 
201 201
 
202 202
 function app_LabelledCheckbox($labelText, $checkboxName, $options = null)
203 203
 {
204
-	$W = bab_Widgets();
204
+    $W = bab_Widgets();
205 205
 
206
-	$label = $W->Label($labelText)->colon(false);
207
-	$checkbox = $W->Checkbox()->setName($checkboxName);
208
-	$label->setAssociatedWidget($checkbox);
209
-	if (isset($options)) {
210
-		$label->setSizePolicy(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
211
-	}
206
+    $label = $W->Label($labelText)->colon(false);
207
+    $checkbox = $W->Checkbox()->setName($checkboxName);
208
+    $label->setAssociatedWidget($checkbox);
209
+    if (isset($options)) {
210
+        $label->setSizePolicy(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
211
+    }
212 212
 
213
-	$layout = $W->HBoxItems(
214
-					$checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
215
-					$label
216
-				)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
213
+    $layout = $W->HBoxItems(
214
+                    $checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
215
+                    $label
216
+                )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
217 217
 
218
-	return $layout;
218
+    return $layout;
219 219
 }
220 220
 
221 221
 
@@ -223,42 +223,42 @@  discard block
 block discarded – undo
223 223
 
224 224
 function app_LabelledOrmSelect(ORMMySqlIterator $iterator, $fieldName, $selectName, $label, $hidden = false, $groupFieldName = null)
225 225
 {
226
-	$W = bab_Widgets();
227
-
228
-	if (isset($groupFieldName)) {
229
-		$groupPathElements = explode('/', $groupFieldName);
230
-	}
231
-
232
-	$select = $W->Select()->setName($selectName);
233
-
234
-	$select->addOption('', '');
235
-
236
-	$nbOptions = 0;
237
-	foreach ($iterator as $record) {
238
-		if (isset($record->code)) {
239
-			$optionText = $record->code . ' - ' . $record->$fieldName;
240
-		} else {
241
-			$optionText = $record->$fieldName;
242
-		}
243
-		if (isset($groupFieldName)) {
244
-			$group = $record;
245
-			foreach ($groupPathElements as $groupPathElement) {
246
-				$group = $group->$groupPathElement;
247
-			}
248
-			$select->addOption($record->id, $optionText, $group);
249
-		} else {
250
-			$select->addOption($record->id, $optionText);
251
-		}
252
-		$nbOptions++;
253
-		$lastId = $record->id;
254
-	}
255
-
256
-	if ($nbOptions == 1) {
257
-		$select->setValue($lastId);
258
-	}
259
-
260
-
261
-	return app_LabelledWidget($label, $select);
226
+    $W = bab_Widgets();
227
+
228
+    if (isset($groupFieldName)) {
229
+        $groupPathElements = explode('/', $groupFieldName);
230
+    }
231
+
232
+    $select = $W->Select()->setName($selectName);
233
+
234
+    $select->addOption('', '');
235
+
236
+    $nbOptions = 0;
237
+    foreach ($iterator as $record) {
238
+        if (isset($record->code)) {
239
+            $optionText = $record->code . ' - ' . $record->$fieldName;
240
+        } else {
241
+            $optionText = $record->$fieldName;
242
+        }
243
+        if (isset($groupFieldName)) {
244
+            $group = $record;
245
+            foreach ($groupPathElements as $groupPathElement) {
246
+                $group = $group->$groupPathElement;
247
+            }
248
+            $select->addOption($record->id, $optionText, $group);
249
+        } else {
250
+            $select->addOption($record->id, $optionText);
251
+        }
252
+        $nbOptions++;
253
+        $lastId = $record->id;
254
+    }
255
+
256
+    if ($nbOptions == 1) {
257
+        $select->setValue($lastId);
258
+    }
259
+
260
+
261
+    return app_LabelledWidget($label, $select);
262 262
 }
263 263
 
264 264
 
@@ -307,36 +307,36 @@  discard block
 block discarded – undo
307 307
             ->setMaxSize($field->getMaxLength());
308 308
     } else if ($field instanceof ORMTextField) {
309 309
         $widget = $W->TextEdit()
310
-          ->addClass('widget-autoresize');
310
+            ->addClass('widget-autoresize');
311 311
     } else if ($field instanceof ORMPkField) {
312 312
         $widget = $W->Hidden();
313 313
     } else if ($field instanceof ORMFkField) {
314 314
 
315 315
         $fieldName = $field->getName();
316 316
         /** @var AppRecordSet $parentSet */
317
-		$parentSet = clone $field->getParentSet();
317
+        $parentSet = clone $field->getParentSet();
318 318
         $parentSet->join($fieldName);
319 319
         $set = $parentSet->$fieldName;
320 320
         $records = $set->select();
321
-		$pkName = $set->getPrimaryKey();
322
-		if($set->fieldExist("name")){
323
-			$displayField = $set->name->getName();
324
-		}else if(method_exists($set,"getDisplayNameField")){
325
-			$displayField = $set->getDisplayNameField()->getName();
326
-		}else{
327
-			$displayField = $pkName;
328
-		}
329
-		$records->orderAsc($set->$displayField);
330
-		if($records->count() > 50){
331
-			$widget = bab_Widgets()->select2();
332
-			$widget->setDataSource($set->getController()->search());
333
-		}else{
334
-			$widget = $W->Select();
335
-			$widget->addOption('', '');
336
-			foreach ($records as $record) {
337
-				$widget->addOption($record->$pkName, $record->$displayField);
338
-			}
339
-		}
321
+        $pkName = $set->getPrimaryKey();
322
+        if($set->fieldExist("name")){
323
+            $displayField = $set->name->getName();
324
+        }else if(method_exists($set,"getDisplayNameField")){
325
+            $displayField = $set->getDisplayNameField()->getName();
326
+        }else{
327
+            $displayField = $pkName;
328
+        }
329
+        $records->orderAsc($set->$displayField);
330
+        if($records->count() > 50){
331
+            $widget = bab_Widgets()->select2();
332
+            $widget->setDataSource($set->getController()->search());
333
+        }else{
334
+            $widget = $W->Select();
335
+            $widget->addOption('', '');
336
+            foreach ($records as $record) {
337
+                $widget->addOption($record->$pkName, $record->$displayField);
338
+            }
339
+        }
340 340
     } else if ($field instanceof ORMRecordSet) {
341 341
         $widget = $W->Select();
342 342
 ////        $widget = $W->MultiSelect()->setSingleSelect();
@@ -362,21 +362,21 @@  discard block
 block discarded – undo
362 362
 
363 363
 function app_LabelledOrmWidget(ORMField $field, $label = null, $hidden = false)
364 364
 {
365
-	$W = bab_Widgets();
365
+    $W = bab_Widgets();
366 366
 
367
-	if ($hidden) {
368
-		$widget = $W->Hidden();
369
-		$widget->setName($field->getName());
370
-		return $widget;
371
-	}
367
+    if ($hidden) {
368
+        $widget = $W->Hidden();
369
+        $widget->setName($field->getName());
370
+        return $widget;
371
+    }
372 372
 
373
-	if (is_null($label)) {
374
-		$label = $field->getDescription();
375
-	}
373
+    if (is_null($label)) {
374
+        $label = $field->getDescription();
375
+    }
376 376
 
377
-	$widget = app_OrmWidget($field);
377
+    $widget = app_OrmWidget($field);
378 378
 
379
-	return app_LabelledWidget($label, $widget);
379
+    return app_LabelledWidget($label, $widget);
380 380
 }
381 381
 
382 382
 
@@ -392,16 +392,16 @@  discard block
 block discarded – undo
392 392
  */
393 393
 function app_dateTime(ORMField $field, $value) {
394 394
 
395
-	$W = bab_Widgets();
396
-	$name = $field->getName();
397
-	$label = $W->Label($field->getDescription());
395
+    $W = bab_Widgets();
396
+    $name = $field->getName();
397
+    $label = $W->Label($field->getDescription());
398 398
 
399
-	$frame = app_dateTimeField($name, $label, $value);
399
+    $frame = app_dateTimeField($name, $label, $value);
400 400
 
401
-	return $W->VBoxItems(
402
-		$label,
403
-		$frame
404
-	);
401
+    return $W->VBoxItems(
402
+        $label,
403
+        $frame
404
+    );
405 405
 
406 406
 }
407 407
 
@@ -415,24 +415,24 @@  discard block
 block discarded – undo
415 415
  */
416 416
 function app_dateTimeField($fieldName, WidgetLabel $label, $value = null)
417 417
 {
418
-	$W = bab_Widgets();
418
+    $W = bab_Widgets();
419 419
 
420
-	$datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
421
-	$timepart = $W->TimePicker()->setName('time');
420
+    $datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
421
+    $timepart = $W->TimePicker()->setName('time');
422 422
 
423
-	if (isset($value)) {
423
+    if (isset($value)) {
424 424
 
425
-		$value = explode(' ', $value);
425
+        $value = explode(' ', $value);
426 426
 
427
-		$datepart->setValue($value[0]);
428
-		$timepart->setValue($value[1]);
429
-	}
427
+        $datepart->setValue($value[0]);
428
+        $timepart->setValue($value[1]);
429
+    }
430 430
 
431
-	$datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
432
-			->addItem($datepart)
433
-			->addItem($timepart);
431
+    $datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
432
+            ->addItem($datepart)
433
+            ->addItem($timepart);
434 434
 
435
-	return $datetime;
435
+    return $datetime;
436 436
 }
437 437
 
438 438
 
Please login to merge, or discard this patch.