diff --git a/web/src/app/campaigns/arc-create/arc-create.component.ts b/web/src/app/campaigns/arc-create/arc-create.component.ts index 9fa518d..5ad16ec 100644 --- a/web/src/app/campaigns/arc-create/arc-create.component.ts +++ b/web/src/app/campaigns/arc-create/arc-create.component.ts @@ -5,6 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { forkJoin } from 'rxjs'; import { LucideAngularModule, BookOpen } from 'lucide-angular'; import { CampaignService } from '../../services/campaign.service'; +import { CharacterService } from '../../services/character.service'; import { LayoutService, GlobalItem } from '../../services/layout.service'; import { Campaign } from '../../services/campaign.model'; import { loadCampaignTreeData, buildCampaignTree } from '../campaign-tree.helper'; @@ -33,6 +34,7 @@ export class ArcCreateComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private router: Router, private campaignService: CampaignService, + private characterService: CharacterService, private layoutService: LayoutService ) { this.form = this.fb.group({ @@ -50,7 +52,7 @@ export class ArcCreateComponent implements OnInit, OnDestroy { forkJoin({ campaign: this.campaignService.getCampaignById(this.campaignId), allCampaigns: this.campaignService.getAllCampaigns(), - treeData: loadCampaignTreeData(this.campaignService, this.campaignId) + treeData: loadCampaignTreeData(this.campaignService, this.campaignId, this.characterService) }).subscribe(({ campaign, allCampaigns, treeData }) => { this.existingArcCount = treeData.arcs.length; diff --git a/web/src/app/campaigns/arc-edit/arc-edit.component.ts b/web/src/app/campaigns/arc-edit/arc-edit.component.ts index 8123f4e..31af867 100644 --- a/web/src/app/campaigns/arc-edit/arc-edit.component.ts +++ b/web/src/app/campaigns/arc-edit/arc-edit.component.ts @@ -6,6 +6,7 @@ import { forkJoin, of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { LucideAngularModule, Trash2, Sparkles } from 'lucide-angular'; import { CampaignService } from '../../services/campaign.service'; +import { CharacterService } from '../../services/character.service'; import { PageService } from '../../services/page.service'; import { LayoutService, GlobalItem } from '../../services/layout.service'; import { PageTitleService } from '../../services/page-title.service'; @@ -68,6 +69,7 @@ export class ArcEditComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private router: Router, private campaignService: CampaignService, + private characterService: CharacterService, private pageService: PageService, private layoutService: LayoutService, private pageTitleService: PageTitleService @@ -105,7 +107,7 @@ export class ArcEditComponent implements OnInit, OnDestroy { campaign: this.campaignService.getCampaignById(this.campaignId), allCampaigns: this.campaignService.getAllCampaigns(), arc: this.campaignService.getArcById(this.arcId), - treeData: loadCampaignTreeData(this.campaignService, this.campaignId) + treeData: loadCampaignTreeData(this.campaignService, this.campaignId, this.characterService) }).pipe( switchMap(data => { const lid = data.campaign.loreId ?? null; diff --git a/web/src/app/campaigns/arc-view/arc-view.component.ts b/web/src/app/campaigns/arc-view/arc-view.component.ts index a1d186e..dfad88c 100644 --- a/web/src/app/campaigns/arc-view/arc-view.component.ts +++ b/web/src/app/campaigns/arc-view/arc-view.component.ts @@ -5,6 +5,7 @@ import { forkJoin, of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { LucideAngularModule, Pencil, Trash2 } from 'lucide-angular'; import { CampaignService } from '../../services/campaign.service'; +import { CharacterService } from '../../services/character.service'; import { PageService } from '../../services/page.service'; import { LayoutService, GlobalItem } from '../../services/layout.service'; import { PageTitleService } from '../../services/page-title.service'; @@ -42,6 +43,7 @@ export class ArcViewComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private router: Router, private campaignService: CampaignService, + private characterService: CharacterService, private pageService: PageService, private layoutService: LayoutService, private pageTitleService: PageTitleService @@ -64,7 +66,7 @@ export class ArcViewComponent implements OnInit, OnDestroy { campaign: this.campaignService.getCampaignById(this.campaignId), allCampaigns: this.campaignService.getAllCampaigns(), arc: this.campaignService.getArcById(this.arcId), - treeData: loadCampaignTreeData(this.campaignService, this.campaignId) + treeData: loadCampaignTreeData(this.campaignService, this.campaignId, this.characterService) }).pipe( switchMap(data => { const lid = data.campaign.loreId ?? null; diff --git a/web/src/app/campaigns/campaign-detail/campaign-detail.component.html b/web/src/app/campaigns/campaign-detail/campaign-detail.component.html index 3a20de5..982f157 100644 --- a/web/src/app/campaigns/campaign-detail/campaign-detail.component.html +++ b/web/src/app/campaigns/campaign-detail/campaign-detail.component.html @@ -70,7 +70,7 @@ -
+

Personnages joueurs

-
+

Arcs narratifs

-
+

Dossiers