-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1400 from bcgov/develop
Deployment PR - 935
- Loading branch information
Showing
232 changed files
with
4,379 additions
and
753 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,4 +13,6 @@ node_modules/ | |
| /test-results/ | ||
| playwright-report/ | ||
| playwright/.cache/ | ||
| .~lock.* | ||
| .~lock.* | ||
|
|
||
| /ora2pg_data | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...rontend/src/app/features/application/boundary-amendment/boundary-amendment.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <div class="split"> | ||
| <h3>ALR Boundary</h3> | ||
| <button mat-flat-button color="primary" (click)="onCreateAmendment()">+ Amendment</button> | ||
| </div> | ||
| <section> | ||
| <div *ngFor="let amendment of amendments; let i = index" class="amendment"> | ||
| <div class="menu"> | ||
| <button (click)="onEditAmendment(amendment)" matTooltip="Edit Amendment" mat-icon-button> | ||
| <mat-icon>edit</mat-icon> | ||
| </button> | ||
| <button (click)="onDeleteAmendment(amendment.uuid)" matTooltip="Delete Amendment" mat-icon-button> | ||
| <mat-icon>delete</mat-icon> | ||
| </button> | ||
| </div> | ||
| <div class="subheading1">Amendment #{{ amendments.length - i }}</div> | ||
| <div class="content"> | ||
| <div class="full-grid-line"> | ||
| <div class="subheading2">Amendment Type</div> | ||
| {{ amendment.type }} | ||
| </div> | ||
| <div> | ||
| <div class="subheading2">Decision Components</div> | ||
| <div *ngFor="let component of amendment.decisionComponents"> | ||
| {{ component.label }} | ||
| </div> | ||
| </div> | ||
| <div> | ||
| <div class="subheading2">Area Included or Excluded (ha)</div> | ||
| <app-inline-number | ||
| [value]="amendment.area.toString()" | ||
| (save)="onSaveAlrArea(amendment.uuid, $event)" | ||
| [decimals]="5" | ||
| ></app-inline-number> | ||
| </div> | ||
| <div> | ||
| <div class="subheading2">ALR Boundary Amendment Year</div> | ||
| <app-inline-dropdown | ||
| [value]="amendment.year?.toString()" | ||
| [options]="years" | ||
| (save)="onSaveYear(amendment.uuid, $event)" | ||
| /> | ||
| </div> | ||
| <div> | ||
| <div class="subheading2">ALR Boundary Amendment Period</div> | ||
| <app-inline-dropdown | ||
| [value]="amendment.period?.toString()" | ||
| [options]="periods" | ||
| (save)="onSavePeriod(amendment.uuid, $event)" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> |
60 changes: 60 additions & 0 deletions
60
...rontend/src/app/features/application/boundary-amendment/boundary-amendment.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| @use '../../../../styles/colors'; | ||
|
|
||
| section { | ||
| margin: 32px 0; | ||
| } | ||
|
|
||
| .amendment { | ||
| margin: 24px 0; | ||
| position: relative; | ||
| box-shadow: 0 2px 8px 1px rgba(0, 0, 0, 0.25); | ||
| padding: 32px; | ||
|
|
||
| .menu { | ||
| position: absolute; | ||
| top: 0; | ||
| right: 0; | ||
| height: 36px; | ||
| background: colors.$primary-color-dark; | ||
| box-shadow: -1px 1px 4px rgba(0, 0, 0, 0.25); | ||
| border-radius: 0 4px 0 10px; | ||
|
|
||
| button { | ||
| color: colors.$white; | ||
| width: 36px; | ||
| height: 36px; | ||
| line-height: 36px; | ||
| } | ||
|
|
||
| mat-icon { | ||
| position: absolute; | ||
| top: 8px; | ||
| left: 8px; | ||
| font-size: 21px; | ||
| width: 20px; | ||
| height: 36px; | ||
| } | ||
| } | ||
|
|
||
| .content { | ||
| margin-top: 16px; | ||
| margin-bottom: 32px; | ||
| display: grid; | ||
| grid-template-columns: 1fr 1fr; | ||
| grid-row-gap: 24px; | ||
| column-gap: 12px; | ||
|
|
||
| .subheading2 { | ||
| margin-bottom: 6px !important; | ||
| } | ||
|
|
||
| & > div { | ||
| font-size: 16px; | ||
| word-wrap: break-word; | ||
| } | ||
|
|
||
| .full-grid-line { | ||
| grid-column: 1 / 3; | ||
| } | ||
| } | ||
| } |
50 changes: 50 additions & 0 deletions
50
...tend/src/app/features/application/boundary-amendment/boundary-amendment.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import { NO_ERRORS_SCHEMA } from '@angular/core'; | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
| import { MatDialog } from '@angular/material/dialog'; | ||
| import { createMock, DeepMocked } from '@golevelup/ts-jest'; | ||
| import { BehaviorSubject } from 'rxjs'; | ||
| import { ApplicationBoundaryAmendmentService } from '../../../services/application/application-boundary-amendments/application-boundary-amendment.service'; | ||
| import { ApplicationDetailService } from '../../../services/application/application-detail.service'; | ||
| import { ApplicationSubmissionStatusService } from '../../../services/application/application-submission-status/application-submission-status.service'; | ||
| import { ApplicationTimelineService } from '../../../services/application/application-timeline/application-timeline.service'; | ||
| import { ApplicationDto } from '../../../services/application/application.dto'; | ||
|
|
||
| import { BoundaryAmendmentComponent } from './boundary-amendment.component'; | ||
|
|
||
| describe('BoundaryAmendmentComponent', () => { | ||
| let component: BoundaryAmendmentComponent; | ||
| let fixture: ComponentFixture<BoundaryAmendmentComponent>; | ||
| let mockAppDetailService: DeepMocked<ApplicationDetailService>; | ||
|
|
||
| beforeEach(async () => { | ||
| mockAppDetailService = createMock(); | ||
| mockAppDetailService.$application = new BehaviorSubject<ApplicationDto | undefined>(undefined); | ||
|
|
||
| await TestBed.configureTestingModule({ | ||
| providers: [ | ||
| { | ||
| provide: ApplicationDetailService, | ||
| useValue: mockAppDetailService, | ||
| }, | ||
| { | ||
| provide: ApplicationBoundaryAmendmentService, | ||
| useValue: {}, | ||
| }, | ||
| { | ||
| provide: MatDialog, | ||
| useValue: {}, | ||
| }, | ||
| ], | ||
| declarations: [BoundaryAmendmentComponent], | ||
| schemas: [NO_ERRORS_SCHEMA], | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(BoundaryAmendmentComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
Oops, something went wrong.