diff --git a/apps/dafa-web/src/app/data/models/staff.model.ts b/apps/dafa-web/src/app/data/models/staff.model.ts index 97d602f..dd776f9 100644 --- a/apps/dafa-web/src/app/data/models/staff.model.ts +++ b/apps/dafa-web/src/app/data/models/staff.model.ts @@ -6,7 +6,7 @@ export interface Staff { staffId: string; firstName: string; lastName: string; - kommun: string; + utforandeverksamhet: string; active: boolean; service: string; fullName?: string; diff --git a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html index 13241ff..86c83c3 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html +++ b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.html @@ -10,25 +10,22 @@

Personuppgifter

- - + + - - -
-
-

Bemanning av personal

+

Tjänst

- - - + +
+
+ Tilldela behörigheter + + + + + + + + +
Avbryt diff --git a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss index 00740d9..abb80dc 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss +++ b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.scss @@ -4,7 +4,6 @@ &__block { max-width: var(--digi--typography--text--max-width); } - &__combined-inputs { display: flex; gap: var(--digi--layout--gutter); @@ -16,11 +15,16 @@ margin-bottom: var(--digi--layout--gutter); } + &__permission-checkbox { + display: flex; + height: 5rem; + align-items: center; + } + &__fieldset { - margin: 0; - margin-bottom: var(--digi--layout--gutter); padding: 0; - border-width: 0; + border: 0; + margin-top: var(--digi--layout--gutter); legend { width: 100%; @@ -28,7 +32,7 @@ align-items: center; margin: 0; font-weight: var(--digi--typography--font-weight--bold); - font-size: var(--digi--typography--font-size); + font-size: 1.5rem; padding-bottom: var(--digi--layout--gutter--s); } } @@ -51,7 +55,16 @@ } &__footer { + margin-top: var(--digi--layout--gutter); display: flex; gap: var(--digi--layout--gutter); } } + +.search-address { + width: 30%; +} + +digi-ng-popover { + margin-left: var(--digi--layout--gutter); +} diff --git a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.ts b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.ts index e22619f..7cd6da6 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.ts +++ b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.component.ts @@ -1,7 +1,10 @@ import { RadiobuttonModel } from '@af/digi-ng/_form/form-radiobutton-group'; +import { FormSelectBaseItem } from '@af/digi-ng/_form/form-select-base'; +import { PopoverDirection, PopoverOrientation } from '@af/digi-ng/_popover/popover'; import { ChangeDetectionStrategy, Component } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms'; import { Router } from '@angular/router'; +import { Service } from '@dafa-enums/service.enum'; import { OutOfOfficeDate } from '@dafa-models/out-of-office-date.model'; import { StaffService } from '@dafa-services/api/staff.service'; import { RequiredValidator } from '@dafa-validators/required.validator'; @@ -15,47 +18,61 @@ import { BehaviorSubject } from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class CreateAccountComponent { - private _pendingOutOfOfficeDates$ = new BehaviorSubject([ - { - id: 123456789, - start: new Date(), - end: new Date(), - }, - { - id: 987654321, - start: new Date(), - end: new Date(), - }, - ]); + private _searchValue$ = new BehaviorSubject(''); + formGroup: FormGroup; todaysDate = new Date(); + list: FormSelectBaseItem[] = [ + { + name: Service.STOM, + value: '1', + }, + { + name: Service.KVL, + value: '2', + }, + { + name: Service.KROM, + value: '3', + }, + ]; + constructor(private formBuilder: FormBuilder, private staffService: StaffService, private router: Router) { this.formGroup = this.formBuilder.group({ firstName: this.formBuilder.control('', [RequiredValidator('Förnamn')]), lastName: this.formBuilder.control('', [RequiredValidator('Efternamn')]), ssn: this.formBuilder.control('', [RequiredValidator('Personnummer'), SocialSecurityNumberValidator()]), staffId: this.formBuilder.control('', [RequiredValidator('Personal-ID')]), - email: this.formBuilder.control('', [RequiredValidator('Arbetsmejl')]), - phone: this.formBuilder.control('', [RequiredValidator('Telefonnummer arbete')]), - active: this.formBuilder.control(true), - outOfOfficeStart: this.formBuilder.control(''), - outOfOfficeEnd: this.formBuilder.control(''), + service: this.formBuilder.control(''), + permissions: this.formBuilder.control(false), + participant: this.formBuilder.control(false), + infoParticipant: this.formBuilder.control(false), + orderBills: this.formBuilder.control(false), }); } - get pendingOutOfOfficeDates(): OutOfOfficeDate[] { - return this._pendingOutOfOfficeDates$.getValue(); + handleSearchSubmit(): void { + // skicka searchvalue till en service och filtrera } - get activeRadioButtons(): RadiobuttonModel[] { + + handleSearchInput($event: CustomEvent): void { + this._searchValue$.next($event.detail.target.value); + } + + get formselectItem(): FormSelectBaseItem[] { return [ { - label: 'Ja', - value: true, + name: Service.STOM, + value: '1', }, { - label: 'Nej', - value: false, + name: Service.KVL, + value: '2', + }, + { + name: Service.KROM, + value: '3', }, ]; } @@ -69,41 +86,6 @@ export class CreateAccountComponent { get ssnControl(): AbstractControl { return this.formGroup.get('ssn'); } - get staffIdControl(): AbstractControl { - return this.formGroup.get('staffId'); - } - get emailControl(): AbstractControl { - return this.formGroup.get('email'); - } - get phoneControl(): AbstractControl { - return this.formGroup.get('phone'); - } - get outOfOfficeStartControl(): AbstractControl { - return this.formGroup.get('outOfOfficeStart'); - } - get outOfOfficeEndControl(): AbstractControl { - return this.formGroup.get('outOfOfficeEnd'); - } - - addOutOfOfficeDate(): void { - if (this.outOfOfficeStartControl.value && this.outOfOfficeEndControl.value) { - this._pendingOutOfOfficeDates$.next([ - ...this.pendingOutOfOfficeDates, - { - id: Date.now(), - start: new Date(this.outOfOfficeStartControl.value), - end: new Date(this.outOfOfficeEndControl.value), - }, - ]); - - this.outOfOfficeStartControl.patchValue(''); - this.outOfOfficeEndControl.patchValue(''); - } - } - - removeOutOfOfficeDate(id: number): void { - this._pendingOutOfOfficeDates$.next(this.pendingOutOfOfficeDates.filter(date => date.id !== id)); - } private _markFormAsDirty(): void { Object.keys(this.formGroup.controls).forEach(control => { @@ -117,7 +99,6 @@ export class CreateAccountComponent { const submittableValues = { ...this.formGroup.value, fullName: `${this.firstNameControl.value} ${this.lastNameControl.value}`, - outOfOffice: this.pendingOutOfOfficeDates, }; delete submittableValues.outOfOfficeStart; diff --git a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.module.ts b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.module.ts index fc5d6f5..3fe912e 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.module.ts +++ b/apps/dafa-web/src/app/pages/administration/pages/create-account/create-account.module.ts @@ -7,6 +7,9 @@ import { ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { LocalDatePipeModule } from '@dafa-shared/pipes/local-date/local-date.module'; import { CreateAccountComponent } from './create-account.component'; +import { DigiNgPopoverModule } from '@af/digi-ng/_popover/popover'; +import { DigiNgFormCheckboxModule } from '@af/digi-ng/_form/form-checkbox'; +import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select'; @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], @@ -19,6 +22,9 @@ import { CreateAccountComponent } from './create-account.component'; DigiNgFormInputModule, DigiNgFormRadiobuttonGroupModule, DigiNgFormDatepickerModule, + DigiNgFormSelectModule, + DigiNgPopoverModule, + DigiNgFormCheckboxModule, ], }) export class CreateAccountModule {} diff --git a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html index d7a4fc0..c06a88c 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html +++ b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.html @@ -11,33 +11,6 @@ - - - - - - - - - + + + @@ -54,10 +36,8 @@ {{ staff.fullName }} - {{ staff.staffId }} - {{ staff.kommun }} - {{ staff.active ? 'Ja' : 'Nej' }} {{ staff.service }} + {{ staff.kommun }} @@ -72,4 +52,5 @@ [afTotalResults]="staff.length" (afOnPageChange)="handlePagination($event.detail)" af-result-name="deltagare" -> +> + diff --git a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.ts b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.ts index 37e204d..bea5fda 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.ts +++ b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.component.ts @@ -17,6 +17,8 @@ export class StaffListComponent { private _currentPage$ = new BehaviorSubject(1); private _staffPerPage = 10; + private _searchValue$ = new BehaviorSubject(''); + get currentPage(): number { return this._currentPage$.getValue(); } diff --git a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.module.ts b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.module.ts index 0360b2d..69ba915 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.module.ts +++ b/apps/dafa-web/src/app/pages/administration/pages/staff/components/staff-list/staff-list.module.ts @@ -4,6 +4,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { StaffListComponent } from './staff-list.component'; + @NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [StaffListComponent], diff --git a/apps/dafa-web/src/app/pages/administration/pages/staff/staff.component.html b/apps/dafa-web/src/app/pages/administration/pages/staff/staff.component.html index 6aca395..36ce7d4 100644 --- a/apps/dafa-web/src/app/pages/administration/pages/staff/staff.component.html +++ b/apps/dafa-web/src/app/pages/administration/pages/staff/staff.component.html @@ -8,14 +8,18 @@

- +

Personallista

-

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Earum, officia perferendis? Excepturi animi rem culpa - facere, laboriosam vel, quia eos eligendi, cupiditate doloribus aspernatur unde nihil iste earum corrupti illo. -

+ + + + Start funkar! +
+ +

Välkommen till DAFA 2.0

+

Här finner du de senaste nyheterna om uppdateringar, notiser och mer.

+ +
+
+ +

+ Det har kommit in nya avrop med deltagare, länken nedan tar dig till fliken Nya deltagare. Du finner den också + i vänster menyn på sidan +

+ + + +
+ +
+ +

Large alert! Check the knobs section and play around!

+ +
+ +

Dina skickade tilldelningar har nått fram till handledare som godkänt och arbetat vidare med deltagarna

+ +
+
+
+ +













+ +
+
+
diff --git a/apps/dafa-web/src/app/pages/start/start.component.scss b/apps/dafa-web/src/app/pages/start/start.component.scss index e69de29..bf22016 100644 --- a/apps/dafa-web/src/app/pages/start/start.component.scss +++ b/apps/dafa-web/src/app/pages/start/start.component.scss @@ -0,0 +1,24 @@ +@import 'variables/gutters'; +.start { + &__wrapper { + display: grid; + grid-template-rows: auto; + grid-template-areas: + 'header header ' + 'main sidebar' + 'footer footer '; + grid-gap: var(--digi--layout--gutter); + } + &__main { + grid-area: main; + } + &__sidebar { + grid-area: sidebar; + } + &__sidebar-alert { + margin-top: var(--digi--layout--gutter); + } + &__footer { + grid-area: footer; + } +} diff --git a/apps/dafa-web/src/app/pages/start/start.component.ts b/apps/dafa-web/src/app/pages/start/start.component.ts index f152359..da381f5 100644 --- a/apps/dafa-web/src/app/pages/start/start.component.ts +++ b/apps/dafa-web/src/app/pages/start/start.component.ts @@ -1,4 +1,12 @@ +import { CardHeadingLevel, CardVariation } from '@af/digi-ng/_card/card'; +import { + NotificationAlertHeadingLevel, + NotificationAlertSize, + NotificationAlertVariation, +} from '@af/digi-ng/_notification/notification-alert'; import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { InfoCardHeadingLevel } from '@digi/core/dist/types/components/_info-card/info-card/info-card-heading-level.enum'; +import { InfoCardType } from '@digi/core/dist/types/components/_info-card/info-card/info-card-type.enum'; @Component({ selector: 'dafa-start', diff --git a/apps/dafa-web/src/app/pages/start/start.module.ts b/apps/dafa-web/src/app/pages/start/start.module.ts index 24030c7..7e029d1 100644 --- a/apps/dafa-web/src/app/pages/start/start.module.ts +++ b/apps/dafa-web/src/app/pages/start/start.module.ts @@ -1,10 +1,20 @@ import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { StartComponent } from './start.component'; +import { DigiNgCardModule } from '@af/digi-ng/_card/card'; +import { DigiNgNotificationAlertModule } from '@af/digi-ng/_notification/notification-alert'; +import { DigiNgLinkInternalModule } from '@af/digi-ng/_link/link-internal'; @NgModule({ + schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [StartComponent], - imports: [CommonModule, RouterModule.forChild([{ path: '', component: StartComponent }])], + imports: [ + CommonModule, + RouterModule.forChild([{ path: '', component: StartComponent }]), + DigiNgCardModule, + DigiNgNotificationAlertModule, + DigiNgLinkInternalModule, + ], }) export class StartModule {} diff --git a/package.json b/package.json index b47c292..e84ac75 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "MIT", "repository": "https://bitbucket.arbetsformedlingen.se/projects/TEA/repos/dafa-web-monorepo", "engines": { - "node": "15.11.0" + "node": "14.16.1" }, "scripts": { "ng": "nx",