diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index c9dff079..4485c107 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -10,6 +10,7 @@ $rules = [ '@Symfony' => true, 'phpdoc_no_empty_return' => false, + 'phpdoc_to_comment' => false, 'array_syntax' => ['syntax' => 'short'], 'yoda_style' => false, 'binary_operator_spaces' => [ diff --git a/addon/components/activity-event-selector.hbs b/addon/components/activity-event-selector.hbs index d7b40fe8..901c9ddd 100644 --- a/addon/components/activity-event-selector.hbs +++ b/addon/components/activity-event-selector.hbs @@ -10,7 +10,17 @@
- +
{{#each-in this.availableEvents as |eventName event|}} diff --git a/addon/components/activity-form-panel.hbs b/addon/components/activity-form-panel.hbs index 93e67fc8..acac8131 100644 --- a/addon/components/activity-form-panel.hbs +++ b/addon/components/activity-form-panel.hbs @@ -1,5 +1,23 @@ - - + +
-
{{#each this.logic as |logic index|}}
- +
{{#each this.types as |type|}} @@ -28,7 +44,15 @@
-
@@ -38,15 +62,34 @@
- +
{{#let (get this.operators condition.operator) as |operatorMap|}} - +
diff --git a/addon/components/admin/avatar-management.hbs b/addon/components/admin/avatar-management.hbs index 8cc3601b..73060ad5 100644 --- a/addon/components/admin/avatar-management.hbs +++ b/addon/components/admin/avatar-management.hbs @@ -2,7 +2,13 @@
{{#each this.categories as |category index|}} - +
@@ -13,7 +19,9 @@
{{#if this.isUploading}} -
+
diff --git a/addon/components/admin/visibility-controls.hbs b/addon/components/admin/visibility-controls.hbs index 04072a9a..3c27248a 100644 --- a/addon/components/admin/visibility-controls.hbs +++ b/addon/components/admin/visibility-controls.hbs @@ -2,11 +2,24 @@

{{t "fleet-ops.component.admin.visibility-controls.message"}}

{{#each this.visibilitySettings as |visibilityControl|}} - + {{/each}}
-
\ No newline at end of file diff --git a/addon/components/avatar-picker.hbs b/addon/components/avatar-picker.hbs index df91a8f8..e84b10fc 100644 --- a/addon/components/avatar-picker.hbs +++ b/addon/components/avatar-picker.hbs @@ -1,7 +1,15 @@
{{else}}
diff --git a/addon/components/cell/vehicle-name.hbs b/addon/components/cell/vehicle-name.hbs index c448a41a..8c6e909c 100644 --- a/addon/components/cell/vehicle-name.hbs +++ b/addon/components/cell/vehicle-name.hbs @@ -1,5 +1,11 @@
- {{this.altText}} + {{this.altText}} {{#if (has-block)}} @@ -12,6 +18,6 @@ {{#if @column.showOnlineIndicator}} - + {{/if}}
\ No newline at end of file diff --git a/addon/components/contact-form-panel.hbs b/addon/components/contact-form-panel.hbs index cd6802f5..7eb41625 100644 --- a/addon/components/contact-form-panel.hbs +++ b/addon/components/contact-form-panel.hbs @@ -18,9 +18,20 @@
-
-
@@ -28,7 +39,7 @@
- {{this.contact.name}} + {{this.contact.name}} diff --git a/addon/components/contact-panel.hbs b/addon/components/contact-panel.hbs index fcb595cc..ab169d44 100644 --- a/addon/components/contact-panel.hbs +++ b/addon/components/contact-panel.hbs @@ -1,18 +1,40 @@ - +
-
- {{this.contact.name}} + {{this.contact.name}} diff --git a/addon/components/context-panel.hbs b/addon/components/context-panel.hbs index 67e60c1e..56190b0a 100644 --- a/addon/components/context-panel.hbs +++ b/addon/components/context-panel.hbs @@ -1,5 +1,5 @@ {{#if this.contextPanel.currentContextRegistry}} - {{#let this.contextPanel.currentContext this.contextPanel.currentContextRegistry this.contextPanel.currentContextComponentArguments as |model registry dynamicArgs|}} + {{#let this.contextPanel.currentContext this.contextPanel.currentContextRegistry this.contextPanel.currentContextComponentArguments as |model registry dynamicArgs|}} {{component registry.component context=model dynamicArgs=dynamicArgs onPressCancel=this.contextPanel.clear options=this.contextPanel.contextOptions}} {{/let}} {{/if}} \ No newline at end of file diff --git a/addon/components/custom-entity-form-panel.hbs b/addon/components/custom-entity-form-panel.hbs index 8c4ec42b..c324ef14 100644 --- a/addon/components/custom-entity-form-panel.hbs +++ b/addon/components/custom-entity-form-panel.hbs @@ -1,5 +1,19 @@ - - + +
@@ -50,7 +84,17 @@ {{/if}} - +
{{#each this.colSpanSizeOptions as |size|}} diff --git a/addon/components/custom-field-form-panel/options-input.hbs b/addon/components/custom-field-form-panel/options-input.hbs index a2f6c59d..2e0d39fd 100644 --- a/addon/components/custom-field-form-panel/options-input.hbs +++ b/addon/components/custom-field-form-panel/options-input.hbs @@ -5,7 +5,12 @@
{{#each-in this.options as |index option|}}
- +
{{/each-in}} diff --git a/addon/components/custom-field.hbs b/addon/components/custom-field.hbs index acbc97ae..e9a42109 100644 --- a/addon/components/custom-field.hbs +++ b/addon/components/custom-field.hbs @@ -1,7 +1,13 @@ {{#if this.customFieldComponent}} -
+
{{#if (eq this.customFieldComponent "input")}} - + {{else if (eq this.customFieldComponent "select")}} + + + +
{{#if this.search.isRunning}}
@@ -12,7 +17,16 @@ {{/if}}
- + {{model.displayName}}
@@ -49,7 +63,7 @@
{{vehicle.name}} - +
diff --git a/addon/components/fleet-vehicle-listing.hbs b/addon/components/fleet-vehicle-listing.hbs index cdd2f5f6..bd45b1cd 100644 --- a/addon/components/fleet-vehicle-listing.hbs +++ b/addon/components/fleet-vehicle-listing.hbs @@ -12,7 +12,17 @@
{{#if @onAddVehicle}} - + {{model.display_name}} {{/if}} @@ -48,7 +58,7 @@
{{vehicle.display_name}} - +
diff --git a/addon/components/fuel-report-form-panel.hbs b/addon/components/fuel-report-form-panel.hbs index e3278752..176a5af2 100644 --- a/addon/components/fuel-report-form-panel.hbs +++ b/addon/components/fuel-report-form-panel.hbs @@ -1,44 +1,130 @@ - - + +
-
- + {{model.name}} - + {{model.name}} - + {{model.display_name}}
- + {{smart-humanize status}}
- + - - + + diff --git a/addon/components/fuel-report-panel.hbs b/addon/components/fuel-report-panel.hbs index 3db663f9..447c0ecd 100644 --- a/addon/components/fuel-report-panel.hbs +++ b/addon/components/fuel-report-panel.hbs @@ -11,7 +11,12 @@ >
- + {{model.name}} - + {{model.name}} - + {{model.name}} - + {{model.displayName}}
- + {{smart-humanize type}}
@@ -45,7 +118,15 @@
- + {{smart-humanize category}}
@@ -56,14 +137,29 @@
- + {{tag}}
- + {{smart-humanize priority}}
@@ -71,7 +167,14 @@
- + {{smart-humanize status}}
diff --git a/addon/components/issue-panel.hbs b/addon/components/issue-panel.hbs index 9eb55726..5c829390 100644 --- a/addon/components/issue-panel.hbs +++ b/addon/components/issue-panel.hbs @@ -11,7 +11,12 @@ >
{{#each this.universeMenuItems as |menuItem|}} {{#if menuItem.renderComponentInPlace}} {{component menuItem.component}} {{else}} - {{menuItem.title}} + {{menuItem.title}} {{/if}} {{/each}} {{#each this.menuPanels as |menuPanel|}} - + {{#each menuPanel.items as |menuItem|}} {{#if menuItem.renderComponentInPlace}} - {{component menuItem.component menuItem=menuItem title=menuItem.title onClick=menuItem.onClick route=(concat this.routePrefix menuItem.route) icon=menuItem.icon rightSideComponent=menuItem.rightSideComponent rightSideComponentContext=menuItem.rightSideComponentContext rightSideStatus=menuItem.rightSideStatus rightSideStatusText=menuItem.rightSideStatusText hideRightSideStatusDot=menuItem.hideRightSideStatusDot rightSideStatusClass=menuItem.rightSideStatusClass disableRightSideStatusHumanize=menuItem.disableRightSideStatusHumanize dropdownButton=menuItem.dropdownButton dropdownButtonActions=menuItem.dropdownButtonActions dropdownButtonIcon=menuItem.dropdownButtonIcon dropdownButtonIconPrefix=menuItem.dropdownButtonIconPrefix dropdownButtonText=menuItem.dropdownButtonText dropdownButtonCalculatePosition=menuItem.dropdownButtonCalculatePosition dropdownButtonRenderInPlace=menuItem.dropdownButtonRenderInPlace dropdownButtonMenuLabel=menuItem.dropdownButtonMenuLabel dropdownButtonWrapperClass=menuItem.dropdownButtonWrapperClass dropdownButtonTriggerClass=menuItem.dropdownButtonTriggerClass registerDropdownButtonAPI=menuItem.registerDropdownButtonAPI}} + {{component + menuItem.component + menuItem=menuItem + title=menuItem.title + onClick=menuItem.onClick + route=(concat this.routePrefix menuItem.route) + icon=menuItem.icon + rightSideComponent=menuItem.rightSideComponent + rightSideComponentContext=menuItem.rightSideComponentContext + rightSideStatus=menuItem.rightSideStatus + rightSideStatusText=menuItem.rightSideStatusText + hideRightSideStatusDot=menuItem.hideRightSideStatusDot + rightSideStatusClass=menuItem.rightSideStatusClass + disableRightSideStatusHumanize=menuItem.disableRightSideStatusHumanize + dropdownButton=menuItem.dropdownButton + dropdownButtonActions=menuItem.dropdownButtonActions + dropdownButtonIcon=menuItem.dropdownButtonIcon + dropdownButtonIconPrefix=menuItem.dropdownButtonIconPrefix + dropdownButtonText=menuItem.dropdownButtonText + dropdownButtonCalculatePosition=menuItem.dropdownButtonCalculatePosition + dropdownButtonRenderInPlace=menuItem.dropdownButtonRenderInPlace + dropdownButtonMenuLabel=menuItem.dropdownButtonMenuLabel + dropdownButtonWrapperClass=menuItem.dropdownButtonWrapperClass + dropdownButtonTriggerClass=menuItem.dropdownButtonTriggerClass + registerDropdownButtonAPI=menuItem.registerDropdownButtonAPI + }} {{else}} - {{menuItem.title}} + {{menuItem.title}} {{/if}} {{/each}} {{/each}} {{#each this.universeMenuPanels as |menuPanel|}} - + {{#each menuPanel.items as |menuItem|}} - {{menuItem.title}} + {{menuItem.title}} {{/each}} {{/each}} diff --git a/addon/components/layout/fleet-ops-sidebar/driver-listing.hbs b/addon/components/layout/fleet-ops-sidebar/driver-listing.hbs index 83ee3b0b..03cec30b 100644 --- a/addon/components/layout/fleet-ops-sidebar/driver-listing.hbs +++ b/addon/components/layout/fleet-ops-sidebar/driver-listing.hbs @@ -1,5 +1,44 @@ - + {{#each this.drivers as |driver|}} - {{driver.name}} + {{driver.name}} {{/each}} \ No newline at end of file diff --git a/addon/components/layout/fleet-ops-sidebar/fleet-listing.hbs b/addon/components/layout/fleet-ops-sidebar/fleet-listing.hbs index 6d03efc5..eb87b350 100644 --- a/addon/components/layout/fleet-ops-sidebar/fleet-listing.hbs +++ b/addon/components/layout/fleet-ops-sidebar/fleet-listing.hbs @@ -1,5 +1,20 @@ - + {{#each this.fleets as |fleet|}} - + {{/each}} \ No newline at end of file diff --git a/addon/components/live-map-drawer.hbs b/addon/components/live-map-drawer.hbs index 98e37f68..2420c11b 100644 --- a/addon/components/live-map-drawer.hbs +++ b/addon/components/live-map-drawer.hbs @@ -2,7 +2,7 @@