Moving away from Azure Devops #1

Merged
Janus007 merged 113 commits from refac into master 2026-02-03 00:04:27 +01:00
4 changed files with 20 additions and 8 deletions
Showing only changes of commit f39e38986c - Show all commits

View file

@ -28,6 +28,10 @@ export class CalendarOrchestrator {
headerContainer.innerHTML = ''; headerContainer.innerHTML = '';
columnContainer.innerHTML = ''; columnContainer.innerHTML = '';
// Sæt data-levels attribut for CSS grid-row styling
const levels = viewConfig.groupings.map(g => g.type).join(' ');
headerContainer.dataset.levels = levels;
// Vælg renderers baseret på groupings types // Vælg renderers baseret på groupings types
const activeRenderers = this.selectRenderers(viewConfig); const activeRenderers = this.selectRenderers(viewConfig);
@ -46,7 +50,10 @@ export class CalendarOrchestrator {
private selectRenderers(viewConfig: ViewConfig): Renderer[] { private selectRenderers(viewConfig: ViewConfig): Renderer[] {
const types = viewConfig.groupings.map(g => g.type); const types = viewConfig.groupings.map(g => g.type);
return this.allRenderers.filter(r => types.includes(r.type)); // Sortér renderers i samme rækkefølge som viewConfig.groupings
return types
.map(type => this.allRenderers.find(r => r.type === type))
.filter((r): r is Renderer => r !== undefined);
} }
private calculateTotalColumns(viewConfig: ViewConfig): number { private calculateTotalColumns(viewConfig: ViewConfig): number {

View file

@ -65,7 +65,7 @@ export class DemoApp {
} }
private buildViewConfig(): ViewConfig { private buildViewConfig(): ViewConfig {
const dates = this.dateService.getWeekDates(this.weekOffset); const dates = this.dateService.getWeekDates(this.weekOffset, 3);
switch (this.currentView) { switch (this.currentView) {
case 'simple': case 'simple':
@ -80,7 +80,7 @@ export class DemoApp {
return { return {
templateId: 'resource', templateId: 'resource',
groupings: [ groupings: [
{ type: 'resource', values: ['res1', 'res2', 'res3'] }, { type: 'resource', values: ['res1', 'res2'] },
{ type: 'date', values: dates } { type: 'date', values: dates }
] ]
}; };

View file

@ -14,9 +14,13 @@
--color-border: #e0e0e0; --color-border: #e0e0e0;
--color-surface: #fff; --color-surface: #fff;
--color-background: #f5f5f5; --color-background: #f5f5f5;
--color-background-hover: #f0f0f0;
--color-background-alt: #fafafa;
--color-text: #333333; --color-text: #333333;
--color-text-secondary: #666; --color-text-secondary: #666;
--color-primary: #1976d2; --color-primary: #1976d2;
--color-team-bg: #e3f2fd;
--color-team-text: #1565c0;
/* Colors - Grid */ /* Colors - Grid */
--color-hour-line: rgba(0, 0, 0, 0.2); --color-hour-line: rgba(0, 0, 0, 0.2);

View file

@ -29,7 +29,7 @@ swp-nav-button {
cursor: pointer; cursor: pointer;
background: var(--color-surface); background: var(--color-surface);
&:hover { background: #f0f0f0; } &:hover { background: var(--color-background-hover); }
} }
swp-week-info { swp-week-info {
@ -75,7 +75,7 @@ swp-header-drawer {
display: block; display: block;
height: 0; height: 0;
overflow: hidden; overflow: hidden;
background: #fafafa; background: var(--color-background-alt);
border-bottom: 1px solid var(--color-border); border-bottom: 1px solid var(--color-border);
} }
@ -180,13 +180,14 @@ swp-team-header {
} }
swp-team-header { swp-team-header {
background: #e3f2fd; background: var(--color-team-bg);
color: #1565c0; color: var(--color-team-text);
font-weight: 500; font-weight: 500;
grid-column: span var(--team-cols, 1);
} }
swp-resource-header { swp-resource-header {
background: #fafafa; background: var(--color-background-alt);
font-size: 13px; font-size: 13px;
} }