Skip to content

Commit 173c22f

Browse files
renemadsenrenemadsen
committed
Merge branch 'stable'
2 parents 656b7a9 + a285a32 commit 173c22f

File tree

3 files changed

+61
-57
lines changed

3 files changed

+61
-57
lines changed

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/GoogleSheetHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public static async Task PushToGoogleSheet(Core core, TimePlanningPnDbContext db
163163

164164
// ... existing code ...
165165

166-
SetAlternatingColumnColors(service, googleSheetId, sheetId!.Value, newHeaders.Count, logger);
166+
// SetAlternatingColumnColors(service, googleSheetId, sheetId!.Value, newHeaders.Count, logger);
167167

168168
logger.LogInformation("Headers are already up-to-date.");
169169
}

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/area-rules.module.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {MatInputModule} from '@angular/material/input';
2525
import {MatCheckboxModule} from '@angular/material/checkbox';
2626
import {MatCardModule} from '@angular/material/card';
2727
import {MatTableModule} from '@angular/material/table';
28+
import {MatMenu, MatMenuItem, MatMenuTrigger} from "@angular/material/menu";
2829

2930
@NgModule({
3031
declarations: [
@@ -55,6 +56,9 @@ import {MatTableModule} from '@angular/material/table';
5556
MatCheckboxModule,
5657
MatCardModule,
5758
MatTableModule,
59+
MatMenuTrigger,
60+
MatMenu,
61+
MatMenuItem,
5862
],
5963
})
6064
export class AreaRulesModule {

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/area-rules/components/area-rules-table/area-rules-table.component.html‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,62 @@ <h3>{{'Pools' | translate}}</h3>
110110
</ng-container>
111111
</ng-template>
112112

113+
<ng-template #actionsT3Tpl let-row let-i="index">
114+
<div class="area-rules-actions" id="action-items-t3-{{i}}">
115+
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
116+
<mat-icon>more_vert</mat-icon>
117+
</button>
118+
119+
<mat-menu #menu="matMenu">
120+
<button
121+
mat-menu-item
122+
id="showAreaRulePlanningBtn-t3-{{i}}"
123+
(click)="onShowPlanAreaRule(row)"
124+
>
125+
<mat-icon color="accent">assignment</mat-icon>
126+
<span>{{ 'Plan and assign' | translate }}</span>
127+
</button>
128+
<button
129+
mat-menu-item
130+
id="updateEntityList-t3-{{i}}"
131+
class="updateEntityList"
132+
(click)="onShowEditEntityListModal(selectedArea.groupId)"
133+
>
134+
<mat-icon color="accent">list</mat-icon>
135+
<span>{{ 'Edit list of stables for tailbites' | translate }}</span>
136+
</button>
137+
</mat-menu>
138+
</div>
139+
</ng-template>
140+
141+
<ng-template #actionsT10bTpl let-row let-i="index">
142+
<div class="area-rules-actions" id="action-items-t10b-{{i}}">
143+
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
144+
<mat-icon>more_vert</mat-icon>
145+
</button>
146+
147+
<mat-menu #menu="matMenu">
148+
<button
149+
mat-menu-item
150+
id="showAreaRulePlanningBtn-t10b-{{i}}"
151+
(click)="onShowPlanAreaRule(row)"
152+
>
153+
<mat-icon color="accent">assignment</mat-icon>
154+
<span>{{ 'Plan and assign' | translate }}</span>
155+
</button>
156+
<button
157+
mat-menu-item
158+
*ngIf="!row.isDefault && selectedArea.type !== 9 && !row.planningStatus"
159+
id="showEditRuleBtn-t10b-{{i}}"
160+
(click)="onShowEditRuleModal(row)"
161+
>
162+
<mat-icon color="accent">edit</mat-icon>
163+
<span>{{ 'Edit rule' | translate }}</span>
164+
</button>
165+
</mat-menu>
166+
</div>
167+
</ng-template>
168+
113169
<ng-container *ngIf="selectedArea.type === 9">
114170
<h3 class="mt-3">{{'Chemicals' | translate}}</h3>
115171
<mtx-grid
@@ -142,60 +198,4 @@ <h3 class="mt-3">{{'Chemicals' | translate}}</h3>
142198
<mat-icon svgIcon="file-pdf"></mat-icon>
143199
</a>
144200
</ng-template>
145-
146-
<ng-template #actionsT3Tpl let-row let-i="index">
147-
<div class="area-rules-actions" id="action-items-t3-{{i}}">
148-
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
149-
<mat-icon>more_vert</mat-icon>
150-
</button>
151-
152-
<mat-menu #menu="matMenu">
153-
<button
154-
mat-menu-item
155-
id="showAreaRulePlanningBtn-t3-{{i}}"
156-
(click)="onShowPlanAreaRule(row)"
157-
>
158-
<mat-icon color="accent">assignment</mat-icon>
159-
<span>{{ 'Plan and assign' | translate }}</span>
160-
</button>
161-
<button
162-
mat-menu-item
163-
id="updateEntityList-t3-{{i}}"
164-
class="updateEntityList"
165-
(click)="onShowEditEntityListModal(selectedArea.groupId)"
166-
>
167-
<mat-icon color="accent">list</mat-icon>
168-
<span>{{ 'Edit list of stables for tailbites' | translate }}</span>
169-
</button>
170-
</mat-menu>
171-
</div>
172-
</ng-template>
173-
174-
<ng-template #actionsT10bTpl let-row let-i="index">
175-
<div class="area-rules-actions" id="action-items-t10b-{{i}}">
176-
<button id="actionMenu" mat-icon-button [matMenuTriggerFor]="menu" matTooltip="{{ 'Actions' | translate }}">
177-
<mat-icon>more_vert</mat-icon>
178-
</button>
179-
180-
<mat-menu #menu="matMenu">
181-
<button
182-
mat-menu-item
183-
id="showAreaRulePlanningBtn-t10b-{{i}}"
184-
(click)="onShowPlanAreaRule(row)"
185-
>
186-
<mat-icon color="accent">assignment</mat-icon>
187-
<span>{{ 'Plan and assign' | translate }}</span>
188-
</button>
189-
<button
190-
mat-menu-item
191-
*ngIf="!row.isDefault && selectedArea.type !== 9 && !row.planningStatus"
192-
id="showEditRuleBtn-t10b-{{i}}"
193-
(click)="onShowEditRuleModal(row)"
194-
>
195-
<mat-icon color="accent">edit</mat-icon>
196-
<span>{{ 'Edit rule' | translate }}</span>
197-
</button>
198-
</mat-menu>
199-
</div>
200-
</ng-template>
201201
</ng-container>

0 commit comments

Comments
 (0)