feature(digi-migrering): Utfasning av digi-ng-expansion-panel till ui-expansion-panel. (TV-851)
Merge in TEA/mina-sidor-fa-web from feature/TV-851-digi-ng-layout-expansion-panel to develop
Squashed commit of the following:
commit 10b046bf603e1c5a79dd5c1129b2cdcddfe09424
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Tue Dec 7 09:18:35 2021 +0100
Fix PR comments
commit 3ca8e27699887c05d225b78c4ebad9c0c60f97f0
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date: Mon Dec 6 13:27:45 2021 +0100
correct PR comments and add better lintint to UI
commit 8d54902fcdad4503e9168a249ca47e39ab207f38
Merge: 1b202e6a 938014ab
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date: Thu Dec 2 10:51:21 2021 +0100
Merge branch 'develop' into feature/TV-851-digi-ng-layout-expansion-panel
commit 1b202e6a9dad961d45e1d0bb1dae766b2a927564
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date: Wed Dec 1 14:56:36 2021 +0100
Utfasning av digi-ng-expansion-panel till ui-expansion-panel.
This commit is contained in:
@@ -81,10 +81,9 @@
|
||||
class="employee-card__utforandeverksamhet-card"
|
||||
>
|
||||
<p *ngIf="utforandeVerksamhet.allaAdresser">Alla adresser inom utförande verksamheten valda.</p>
|
||||
|
||||
<digi-ng-layout-expansion-panel
|
||||
<ui-expansion-panel
|
||||
*ngIf="!utforandeVerksamhet.allaAdresser && utforandeVerksamhet.adresser.length > 0"
|
||||
[afExpanded]="isAccordionExpanded(utforandeVerksamhet.id)"
|
||||
[uiExpanded]="isAccordionExpanded(utforandeVerksamhet.id)"
|
||||
(click)="toggleAccordionExpanded(utforandeVerksamhet.id)"
|
||||
>
|
||||
<span data-slot-trigger>
|
||||
@@ -97,7 +96,7 @@
|
||||
{{address.name}}{{last ? '' : ','}}
|
||||
</li>
|
||||
</ul>
|
||||
</digi-ng-layout-expansion-panel>
|
||||
</ui-expansion-panel>
|
||||
</digi-info-card>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { DigiNgLayoutExpansionPanelModule } from '@af/digi-ng/_layout/layout-expansion-panel';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
@@ -10,6 +9,7 @@ import { UiBackLinkModule } from '@ui/back-link/back-link.module';
|
||||
import { UiLinkButtonModule } from '@ui/link-button/link-button.module';
|
||||
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
|
||||
import { EmployeeCardComponent } from './employee-card.component';
|
||||
import { UiExpansionPanelModule } from '@ui/expansion-panel/expansion-panel.module';
|
||||
|
||||
@NgModule({
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||
@@ -19,11 +19,11 @@ import { EmployeeCardComponent } from './employee-card.component';
|
||||
RouterModule.forChild([{ path: '', component: EmployeeCardComponent }]),
|
||||
LayoutModule,
|
||||
UiSkeletonModule,
|
||||
DigiNgLayoutExpansionPanelModule,
|
||||
LocalDatePipeModule,
|
||||
HideTextModule,
|
||||
UiBackLinkModule,
|
||||
UiLinkButtonModule,
|
||||
UiExpansionPanelModule,
|
||||
RolesDialogModule,
|
||||
],
|
||||
})
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
<p>{{ workExperience.description }}</p>
|
||||
</li>
|
||||
</ul>
|
||||
<digi-ng-layout-expansion-panel
|
||||
class="deltagare-tab-experiences__accordion"
|
||||
[afExpanded]="accordionExpanded"
|
||||
(click)="toggleAccordionExpanded()"
|
||||
<ui-expansion-panel
|
||||
*ngIf="hiddenWorkExperiences(workExperiences)?.length"
|
||||
class="deltagare-tab-experiences__accordion"
|
||||
[uiExpanded]="accordionExpanded"
|
||||
(click)="toggleAccordionExpanded()"
|
||||
>
|
||||
<span class="deltagare-tab-experiences__accordion-trigger" data-slot-trigger
|
||||
>{{ accordionExpanded ? 'Dölj' : 'Visa' }} fler arbetsgivare</span
|
||||
@@ -29,7 +29,7 @@
|
||||
<p>{{ workExperience.description }}</p>
|
||||
</li>
|
||||
</ul>
|
||||
</digi-ng-layout-expansion-panel>
|
||||
</ui-expansion-panel>
|
||||
</div>
|
||||
<div class="deltagare-tab-experiences__tab-column">
|
||||
<h2>Utbildning</h2>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { DigiNgLayoutExpansionPanelModule } from '@af/digi-ng/_layout/layout-expansion-panel';
|
||||
import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
|
||||
@@ -12,6 +11,7 @@ import { UiBackLinkModule } from '@ui/back-link/back-link.module';
|
||||
import { UiLinkButtonModule } from '@ui/link-button/link-button.module';
|
||||
import { UiLoaderModule } from '@ui/loader/loader.module';
|
||||
import { UiSkeletonModule } from '@ui/skeleton/skeleton.module';
|
||||
import { UiExpansionPanelModule } from '@ui/expansion-panel/expansion-panel.module';
|
||||
import { DeltagareTabExperiencesComponent } from './components/deltagare-tab-experiences/deltagare-tab-experiences.component';
|
||||
import { DeltagareTabPersonalInformationComponent } from './components/deltagare-tab-personal-information/deltagare-tab-personal-information.component';
|
||||
import { ReportsListModule } from './components/deltagare-tab-reports/components/reports-list/reports-list.module';
|
||||
@@ -40,12 +40,12 @@ import { UiPopoverModule } from '@ui/popover/ui-popover.module';
|
||||
HideTextModule,
|
||||
UiLoaderModule,
|
||||
HandledarePickerFormModule,
|
||||
DigiNgLayoutExpansionPanelModule,
|
||||
DigiNgPopoverModule,
|
||||
UiPopoverModule,
|
||||
UiSkeletonModule,
|
||||
UiIconModule,
|
||||
UiLinkButtonModule,
|
||||
UiExpansionPanelModule,
|
||||
],
|
||||
providers: [DeltagareCardService],
|
||||
exports: [DeltagareCardComponent],
|
||||
|
||||
Reference in New Issue
Block a user