Revize 6bd78e65

Re #8915 - Zapracování požadavků ze schůzky

• all unit actions under one button

src/app/dashboard/components/dashboard.component.html

@@ -9 +9 @@
             <div class="col-md-6 text-right">
               <p-button label="Sensors graph" icon="pi pi-chart-line" [routerLink]="['/dashboard/unit', unit.unit.unitId]"></p-button>
               <div class="dashboard-button-separator"></div>
-              <p-button label="Add sensor" icon="pi pi-plus-circle" styleClass="p-button-success" (onClick)="insertSensorPopup($event, unit.unit)"></p-button>
-              <p-splitButton *ngIf="loggedUser?.userInfo?.rightsId == 0 || loggedUser?.userInfo?.rightsId == 1" (onClick)="showItems($event, unit.unit)"
-                             icon="pi pi-cog" (onDropdownClick)="showItems($event, unit.unit)" [model]="items" styleClass="p-button-warning"></p-splitButton>
+              <p-button icon="pi pi-cog" styleClass="p-button-warning" (click)="showItems($event, unit.unit); menu.toggle($event)"></p-button>
+              <p-menu #menu [popup]="true" [model]="items" [appendTo]="'body'" [baseZIndex]="50"></p-menu>
             </div>
           </div>
         </p-header>

src/app/dashboard/components/dashboard.component.ts

@@ -74 +74 @@
   }
 
   editUnitPopup($event: MouseEvent, unit: Unit) {
-    $event.stopPropagation();
     this.editedUnit = unit;
     this.showEditUnitPopup = true;
   }
 
   insertSensorPopup($event: any, unit: Unit) {
-    $event.stopPropagation();
     this.showInsertSensorPopup = true;
     this.editedUnit = unit;
   }
 
   deleteUnit($event: any, unit: Unit) {
-    $event.stopPropagation();
     this.confirmationService.confirm({
       message: 'Do you want to delete this unit?',
       header: 'Delete Unit Confirmation',
@@ -121 +118 @@
     $event.stopPropagation();
     this.items = [
       {label: 'Edit unit', icon: 'pi pi-cog', command: () => {
-          event.stopPropagation();
           this.editUnitPopup($event, unit);
         }},
       {label: 'Insert position', icon: 'pi pi-cog', command: () => {
-          event.stopPropagation();
           this.insertPosition($event, unit);
         }},
       {label: 'Delete unit', icon: 'pi pi-times', command: () => {
-          event.stopPropagation();
           this.deleteUnit($event, unit);
+        }},
+      {label: 'Add sensor', icon: 'pi pi-cog', command: () => {
+          this.insertSensorPopup($event, unit);
         }}
     ]
   }

src/app/dashboard/dashboard.module.ts

@@ -14 +14 @@
 import {ConfirmDialogModule} from 'primeng/confirmdialog';
 import {SplitButtonModule} from 'primeng/splitbutton';
 import { PositionInsertPopupComponent } from './components/position-insert-popup/position-insert-popup.component';
+import {MenuModule} from 'primeng/menu';
 
 
 
 @NgModule({
-  declarations: [DashboardComponent, SensorsComponent, UnitPopupComponent, SensorPopupComponent, SensorInsertPopupComponent, PositionInsertPopupComponent],
-  imports: [
-    CommonModule,
-    NavBarModule,
-    RouterModule,
-    ButtonModule,
-    AccordionModule,
-    DialogModule,
-    ReactiveFormsModule,
-    ConfirmDialogModule,
-    SplitButtonModule
-  ]
+  declarations: [DashboardComponent, SensorsComponent, UnitPopupComponent, SensorPopupComponent, SensorInsertPopupComponent,
+    PositionInsertPopupComponent],
+    imports: [
+        CommonModule,
+        NavBarModule,
+        RouterModule,
+        ButtonModule,
+        AccordionModule,
+        DialogModule,
+        ReactiveFormsModule,
+        ConfirmDialogModule,
+        SplitButtonModule,
+        MenuModule
+    ]
 })
 export class DashboardModule { }