arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api): Added connection to the dotnet api (TV-189)

Browse Source 
Squashed commit of the following:

commit 6f06bf69b87c77473c21fbe5fcc5669964793b17
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu May 20 15:01:16 2021 +0200

    Fixed issue with including qp insde breadcrumbs

commit 579b6105acc7a60864f07b6082329872a2105bd3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu May 20 14:46:54 2021 +0200

    Added some more data to the mock-api and fixed navigation-bar

commit f9b820136017584655fadafaf716155aec85316e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu May 20 10:11:55 2021 +0200

    Updated mock-api

commit 5367d2a475b1c0b8807cf5a9c3f8987b3a586de4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed May 19 16:00:07 2021 +0200

    Added different config for dotnet api

commit 47de5b8ad7c0924c82f07568aa2a4386613e3bd6
Merge: 22d5e9a dc40953
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed May 19 07:54:55 2021 +0200

    Merged develop

commit 22d5e9a126e3c1237531407ec3e6d47fbfea55e8
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed May 12 11:48:25 2021 +0200

    Added new configuration to talk with local API
This commit is contained in:
Erik Tiekstra
2021-05-20 15:20:29 +02:00
parent dc40953aba
commit 4334fd7364
32 changed files with 339 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.html
+8 -14
View File
@@ -29,22 +29,14 @@
<h2>Uppgifter om arbete</h2>
<dl>
<dt>Organisation</dt>
<dd *ngIf="detailedEmployeeData.organization; else emptyDD">{{ detailedEmployeeData.organization }}</dd>
<dt>Avdelning</dt>
<dd *ngIf="detailedEmployeeData.organizationDivision; else emptyDD">
{{ detailedEmployeeData.organizationDivision }}
<dt>Utförandeverksamhet</dt>
<dd *ngIf="detailedEmployeeData.organization; else emptyDD">
{{ detailedEmployeeData.organization.address.city }}
</dd>
<dt>Behörigheter</dt>
<dd *ngIf="detailedEmployeeData.accessGroups?.length; else emptyDD">
{{ detailedEmployeeData.accessGroups.join(', ') }}
<dd *ngIf="detailedEmployeeData.authorizations?.length; else emptyDD">
{{ detailedEmployeeData.authorizations.join(', ') }}
</dd>
<dt>Behörighet</dt>
<ng-container *ngIf="detailedEmployeeData.authorisations?.length; else emptyDD">
<dd *ngFor="let item of detailedEmployeeData.authorisations">
{{ item }}
</dd>
</ng-container>
<dt>Frånvaroperiod</dt>
<ng-container *ngIf="detailedEmployeeData.outOfOffice?.length; else emptyDD">
<dd *ngFor="let date of detailedEmployeeData.outOfOffice">
@@ -52,7 +44,9 @@
</dd>
</ng-container>
<dt>Tjänst</dt>
<dd *ngIf="detailedEmployeeData.service; else emptyDD">{{ detailedEmployeeData.service }}</dd>
<dd *ngIf="detailedEmployeeData.services.length; else emptyDD">
{{ detailedEmployeeData.services.join(', ') }}
</dd>
<dt>Språk</dt>
<dd>{{ detailedEmployeeData.languages?.join(', ') }}</dd>
</dl>
apps/dafa-web/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html
+6 -6
View File
@@ -13,18 +13,18 @@
</button>
</th>
<th scope="col" class="employees-list__column-head">
<button class="employees-list__sort-button" (click)="handleSort('service')">
<button class="employees-list__sort-button" (click)="handleSort('services')">
Tjänst
<ng-container *ngIf="sortBy?.key === 'service'">
<ng-container *ngIf="sortBy?.key === 'services'">
<digi-icon-caret-up class="employees-list__sort-icon" *ngIf="!sortBy.reverse"></digi-icon-caret-up>
<digi-icon-caret-down class="employees-list__sort-icon" *ngIf="sortBy.reverse"></digi-icon-caret-down>
</ng-container>
</button>
</th>
<th scope="col" class="employees-list__column-head">
<button class="employees-list__sort-button" (click)="handleSort('utforandeverksamhet')">
<button class="employees-list__sort-button" (click)="handleSort('organization')">
Utförandeverksamhet
<ng-container *ngIf="sortBy?.key === 'utforandeverksamhet'">
<ng-container *ngIf="sortBy?.key === 'organization'">
<digi-icon-caret-up class="employees-list__sort-icon" *ngIf="!sortBy.reverse"></digi-icon-caret-up>
<digi-icon-caret-down class="employees-list__sort-icon" *ngIf="sortBy.reverse"></digi-icon-caret-down>
</ng-container>
@@ -37,8 +37,8 @@
<th scope="row">
<a [routerLink]="employees.id" class="employees-list__link">{{ employees.fullName }}</a>
</th>
<td>{{ employees.service || '-' }}</td>
<td>{{ employees.kommun || '-' }}</td>
<td>{{ employees.services.length ? employees.services.join(', ') : '-' }}</td>
<td>{{ employees.organization.address.city || '-' }}</td>
</tr>
</tbody>
</table>