Skip to content

Commit 1565ae6

Browse files
authored
fix dropdown menu position, also add max length restriction on resultsID and results projec… (#782)
1 parent 2b2e6ca commit 1565ae6

File tree

4 files changed

+5
-29
lines changed

4 files changed

+5
-29
lines changed

client/wfprev-war/src/main/angular/src/app/components/edit-project/project-details/project-details.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class ProjectDetailsComponent implements OnInit, AfterViewInit, OnDestroy
121121
fireCentreId: ['', [Validators.required]],
122122
latitude: [''],
123123
longitude: [''],
124-
resultsProjectCode: ['', [Validators.maxLength(25)]]
124+
resultsProjectCode: ['', [Validators.maxLength(8)]]
125125
});
126126
this.latLongForm = this.fb.group({
127127
latitude: ['', Validators.required],

client/wfprev-war/src/main/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</button>
3535
</div>
3636
</mat-expansion-panel-header>
37-
<mat-menu #menu="matMenu">
37+
<mat-menu #menu="matMenu" xPosition="before">
3838
<button mat-menu-item (click)="deleteFiscalYear(fiscalForms[i],i)" [disabled]="isUndeletable(fiscalForms[i])">
3939
Delete Fiscal Year
4040
</button>
@@ -141,6 +141,7 @@
141141
[placeholder]="'Begin Typing'"
142142
[control]="getFiscalControl(selectedTabIndex, 'resultsOpeningId')"
143143
[tooltip]="getFiscalControl(selectedTabIndex, 'resultsOpeningId')?.value"
144+
[errorMessages]="{ maxlength: messages.maxLengthExceeded }"
144145
/>
145146
</div>
146147

client/wfprev-war/src/main/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate
164164
planFiscalStatusCode: [fiscal?.planFiscalStatusCode ?? 'DRAFT', [Validators.required]],
165165
fiscalPlannedProjectSizeHa: [fiscal?.fiscalPlannedProjectSizeHa ?? '', [Validators.min(0)]],
166166
fiscalCompletedSizeHa: [fiscal?.fiscalCompletedSizeHa ?? '', [Validators.min(0)]],
167-
resultsOpeningId: [fiscal?.resultsOpeningId ?? ''],
167+
resultsOpeningId: [fiscal?.resultsOpeningId ?? '', [Validators.maxLength(11)]],
168168
firstNationsEngagementInd: [fiscal?.firstNationsEngagementInd ?? false],
169169
firstNationsDelivPartInd: [fiscal?.firstNationsDelivPartInd ?? false],
170170
firstNationsPartner: [fiscal?.firstNationsPartner ?? ''],

client/wfprev-war/src/main/angular/src/styles.scss

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,6 @@ body {
99
margin: 0;
1010
}
1111

12-
.cdk-overlay-container {
13-
z-index: 1000000 !important;
14-
.cdk-overlay-connected-position-bounding-box{
15-
position: absolute;
16-
z-index: 1000000 !important;
17-
display: flex;
18-
flex-direction: column;
19-
min-width: 1px;
20-
min-height: 1px;
21-
top: 46px;
22-
left: 1374.73px;
23-
height: 1267px;
24-
width: 146.266px;
25-
align-items: flex-start;
26-
justify-content: flex-start;
27-
.cdk-overlay-pane{
28-
background-color: var(--wf-colour-white);
29-
border-radius: 4px;
30-
}
31-
.mat-mdc-menu-item-text{
32-
text-align: center;
33-
}
34-
}
35-
}
36-
3712
.mat-mdc-snack-bar-container{
3813
.mdc-snackbar__label{
3914
color: var(--wf-colour-white);
@@ -167,4 +142,4 @@ mat-icon,
167142
height: 16px;
168143
margin-right: 8px;
169144
border-radius: 2px;
170-
}
145+
}

0 commit comments

Comments
 (0)