build: Use prettier for typescript
Stop ignoring .ts files in prettier and fix existing issues.
This commit is contained in:
+2
-3
@@ -8,9 +8,8 @@ describe('AddFamilyMemberComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ AddFamilyMemberComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [AddFamilyMemberComponent]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
+38
-21
@@ -17,7 +17,6 @@ import { Dates } from 'app/core/utils/dates';
|
||||
styleUrls: ['./add-family-member.component.scss']
|
||||
})
|
||||
export class AddFamilyMemberComponent implements OnInit {
|
||||
|
||||
/** Maximum Due Date allowed. */
|
||||
maxDate = new Date();
|
||||
/** Minimum age allowed is 0. */
|
||||
@@ -37,17 +36,18 @@ export class AddFamilyMemberComponent implements OnInit {
|
||||
* @param {ClientsService} clientsService Clients Service
|
||||
* @param {SettingsService} settingsService Setting service
|
||||
*/
|
||||
constructor(private formBuilder: UntypedFormBuilder,
|
||||
private dateUtils: Dates,
|
||||
private router: Router,
|
||||
private route: ActivatedRoute,
|
||||
private clientsService: ClientsService,
|
||||
private settingsService: SettingsService) {
|
||||
constructor(
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private dateUtils: Dates,
|
||||
private router: Router,
|
||||
private route: ActivatedRoute,
|
||||
private clientsService: ClientsService,
|
||||
private settingsService: SettingsService
|
||||
) {
|
||||
this.route.data.subscribe((data: { clientTemplate: any }) => {
|
||||
this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions;
|
||||
});
|
||||
this.clientId = this.route.parent.parent.snapshot.params['clientId'];
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@@ -60,17 +60,35 @@ export class AddFamilyMemberComponent implements OnInit {
|
||||
*/
|
||||
createAddFamilyMemberForm() {
|
||||
this.addFamilyMemberForm = this.formBuilder.group({
|
||||
'firstName': ['', Validators.required],
|
||||
'middleName': [''],
|
||||
'lastName': ['', Validators.required],
|
||||
'qualification': [''],
|
||||
'age': ['', Validators.required],
|
||||
'isDependent': [''],
|
||||
'relationshipId': ['', Validators.required],
|
||||
'genderId': ['', Validators.required],
|
||||
'professionId': [''],
|
||||
'maritalStatusId': [''],
|
||||
'dateOfBirth': ['', Validators.required]
|
||||
firstName: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
middleName: [''],
|
||||
lastName: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
qualification: [''],
|
||||
age: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
isDependent: [''],
|
||||
relationshipId: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
genderId: [
|
||||
'',
|
||||
Validators.required
|
||||
],
|
||||
professionId: [''],
|
||||
maritalStatusId: [''],
|
||||
dateOfBirth: [
|
||||
'',
|
||||
Validators.required
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
@@ -90,9 +108,8 @@ export class AddFamilyMemberComponent implements OnInit {
|
||||
dateFormat,
|
||||
locale
|
||||
};
|
||||
this.clientsService.addFamilyMember(this.clientId, data).subscribe(res => {
|
||||
this.clientsService.addFamilyMember(this.clientId, data).subscribe((res) => {
|
||||
this.router.navigate(['../'], { relativeTo: this.route });
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-3
@@ -8,9 +8,8 @@ describe('EditFamilyMemberComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ EditFamilyMemberComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [EditFamilyMemberComponent]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
+43
-24
@@ -17,8 +17,6 @@ import { Dates } from 'app/core/utils/dates';
|
||||
styleUrls: ['./edit-family-member.component.scss']
|
||||
})
|
||||
export class EditFamilyMemberComponent implements OnInit {
|
||||
|
||||
|
||||
/** Maximum Due Date allowed. */
|
||||
maxDate = new Date();
|
||||
/** Add family member form. */
|
||||
@@ -36,13 +34,15 @@ export class EditFamilyMemberComponent implements OnInit {
|
||||
* @param {ClientsService} clientsService Clients Service
|
||||
* @param {SettingsService} settingsService Setting service
|
||||
*/
|
||||
constructor(private formBuilder: UntypedFormBuilder,
|
||||
private dateUtils: Dates,
|
||||
private router: Router,
|
||||
private route: ActivatedRoute,
|
||||
private clientsService: ClientsService,
|
||||
private settingsService: SettingsService) {
|
||||
this.route.data.subscribe((data: { clientTemplate: any, editFamilyMember: any }) => {
|
||||
constructor(
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private dateUtils: Dates,
|
||||
private router: Router,
|
||||
private route: ActivatedRoute,
|
||||
private clientsService: ClientsService,
|
||||
private settingsService: SettingsService
|
||||
) {
|
||||
this.route.data.subscribe((data: { clientTemplate: any; editFamilyMember: any }) => {
|
||||
this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions;
|
||||
this.familyMemberDetails = data.editFamilyMember;
|
||||
});
|
||||
@@ -59,17 +59,35 @@ export class EditFamilyMemberComponent implements OnInit {
|
||||
*/
|
||||
createEditFamilyMemberForm(familyMember: any) {
|
||||
this.editFamilyMemberForm = this.formBuilder.group({
|
||||
'firstName': [familyMember.firstName, Validators.required],
|
||||
'middleName': [familyMember.middleName],
|
||||
'lastName': [familyMember.lastName, Validators.required],
|
||||
'qualification': [familyMember.qualification],
|
||||
'age': [familyMember.age, Validators.required],
|
||||
'isDependent': [familyMember.isDependent],
|
||||
'relationshipId': [familyMember.relationshipId, Validators.required],
|
||||
'genderId': [familyMember.genderId, Validators.required],
|
||||
'professionId': [familyMember.professionId],
|
||||
'maritalStatusId': [familyMember.maritalStatusId],
|
||||
'dateOfBirth': [this.dateUtils.formatDate(familyMember.dateOfBirth, 'yyyy-MM-dd'), Validators.required]
|
||||
firstName: [
|
||||
familyMember.firstName,
|
||||
Validators.required
|
||||
],
|
||||
middleName: [familyMember.middleName],
|
||||
lastName: [
|
||||
familyMember.lastName,
|
||||
Validators.required
|
||||
],
|
||||
qualification: [familyMember.qualification],
|
||||
age: [
|
||||
familyMember.age,
|
||||
Validators.required
|
||||
],
|
||||
isDependent: [familyMember.isDependent],
|
||||
relationshipId: [
|
||||
familyMember.relationshipId,
|
||||
Validators.required
|
||||
],
|
||||
genderId: [
|
||||
familyMember.genderId,
|
||||
Validators.required
|
||||
],
|
||||
professionId: [familyMember.professionId],
|
||||
maritalStatusId: [familyMember.maritalStatusId],
|
||||
dateOfBirth: [
|
||||
this.dateUtils.formatDate(familyMember.dateOfBirth, 'yyyy-MM-dd'),
|
||||
Validators.required
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
@@ -89,9 +107,10 @@ export class EditFamilyMemberComponent implements OnInit {
|
||||
dateFormat,
|
||||
locale
|
||||
};
|
||||
this.clientsService.editFamilyMember(this.familyMemberDetails.clientId, this.familyMemberDetails.id, data).subscribe(res => {
|
||||
this.router.navigate(['../../'], { relativeTo: this.route });
|
||||
});
|
||||
this.clientsService
|
||||
.editFamilyMember(this.familyMemberDetails.clientId, this.familyMemberDetails.id, data)
|
||||
.subscribe((res) => {
|
||||
this.router.navigate(['../../'], { relativeTo: this.route });
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-3
@@ -8,9 +8,8 @@ describe('FamilyMembersTabComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ FamilyMembersTabComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [FamilyMembersTabComponent]
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
@@ -18,7 +18,6 @@ import { ClientsService } from '../../clients.service';
|
||||
styleUrls: ['./family-members-tab.component.scss']
|
||||
})
|
||||
export class FamilyMembersTabComponent {
|
||||
|
||||
/** Client Family Members */
|
||||
clientFamilyMembers: any;
|
||||
|
||||
@@ -27,9 +26,11 @@ export class FamilyMembersTabComponent {
|
||||
* @param {ClientsService} clientsService Clients Service
|
||||
* @param {MatDialog }dialog Mat Dialog
|
||||
*/
|
||||
constructor(private route: ActivatedRoute,
|
||||
private clientsService: ClientsService,
|
||||
public dialog: MatDialog) {
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private clientsService: ClientsService,
|
||||
public dialog: MatDialog
|
||||
) {
|
||||
this.route.data.subscribe((data: { clientFamilyMembers: any }) => {
|
||||
this.clientFamilyMembers = data.clientFamilyMembers;
|
||||
});
|
||||
@@ -44,10 +45,9 @@ export class FamilyMembersTabComponent {
|
||||
});
|
||||
deleteFamilyMemberDialogRef.afterClosed().subscribe((response: any) => {
|
||||
if (response.delete) {
|
||||
this.clientsService.deleteFamilyMember(clientId, id)
|
||||
.subscribe(() => {
|
||||
this.clientFamilyMembers.splice(index, 1);
|
||||
});
|
||||
this.clientsService.deleteFamilyMember(clientId, id).subscribe(() => {
|
||||
this.clientFamilyMembers.splice(index, 1);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -62,5 +62,4 @@ export class FamilyMembersTabComponent {
|
||||
}
|
||||
return fullName;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user