Skip to content

[VS-7270] show Support Person field only for Psy Ed counselling type #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GeorgeWalker merged 2 commits into from
Mar 5, 2026
Merged

[VS-7270] show Support Person field only for Psy Ed counselling type #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57ac1d3
[VS-7270] show Support Person field only for Psy Ed counselling type
vladbelukha Mar 3, 2026
88a0b7e
[VS-7270] disable support person field unless Psy Ed is selected
vladbelukha Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion vsd-app/ClientApp/src/app/shared/form-field/form-field.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export class FormFieldComponent {
@Input() control?: FormControl;
@Input() mask: string = '';
@Input() required: boolean = false;
@Input() disabled: boolean = false;
@Input() errorMessage: string = 'This field is required';
@Input() trimOnBlur: boolean = true;
@Input() options?: Option[];
Expand Down
11 changes: 7 additions & 4 deletions vsd-app/ClientApp/src/app/submit-invoice/submit-invoice.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,13 @@ <h3>Line Items</h3>
<input type="checkbox" [value]="true" formControlName="missedSession">
</app-field>
</div>
<div class="col-4">
<app-field label="Support Person attending Session">
<input class="form-control" type="text" formControlName="attendingSupportPerson" maxlength="100">
</app-field>
<div class="col-3">
<app-form-field
label="Support Person attending Session"
[control]="item.get('attendingSupportPerson')"
type="text"
maxlength="100"
></app-form-field>
</div>
<ng-template #sessionDateInfo>
<h3>Line Item: Hours</h3>
Expand Down
18 changes: 16 additions & 2 deletions vsd-app/ClientApp/src/app/submit-invoice/submit-invoice.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import { MessageDialog } from '../shared/dialogs/message-dialog/message.dialog';
import { EnumHelper, MY_FORMATS } from '../shared/enums-list';
import { FormBase } from '../shared/form-base';
import { POSTAL_CODE } from '../shared/regex.constants';
import { ServiceNotAvailableComponent } from '../shared/service-not-available.component';
import { EmailValidator } from '../shared/validators/email.validator';
import { SignPadDialog } from '../sign-dialog/sign-dialog.component';
import { ServiceNotAvailableComponent } from '../shared/service-not-available.component';

@Component({
selector: 'app-submit-invoice',
Expand Down Expand Up @@ -246,14 +246,28 @@ export class SubmitInvoiceComponent extends FormBase implements OnInit {
}

createLineItem(sessionHours: string = ''): UntypedFormGroup {
return this.fb.group({
const lineItemGroup = this.fb.group({
counsellingType: [0, [Validators.required, Validators.min(100000000)]], // Counselling Session: 100000000 Court Support Counselling: 100000001 Psycho-educational sessions: 100000002 --- VALIDATE THESE NUMBERS ARE CORRECT
missedSession: [false],
sessionDate: ['', Validators.required],
sessionHours: [0, [Validators.required, Validators.min(0.5)]],
sessionAmount: [0], // used for row calculation, not required for submission - could probably subscribe to value changes on controls that need it
attendingSupportPerson: ['']
});

lineItemGroup.get('attendingSupportPerson').disable();

lineItemGroup.get('counsellingType').valueChanges.subscribe((counsellingType) => {
const attendingSupportPersonControl = lineItemGroup.get('attendingSupportPerson');
if (counsellingType === '100000002') {
attendingSupportPersonControl.enable();
} else {
attendingSupportPersonControl.disable();
attendingSupportPersonControl.setValue('');
}
});

return lineItemGroup;
}

addLineItem(): void {
Expand Down
Loading