Commit 3109f8d3 by Muhammad Usman

forms validation reverted to helper service

parent 4188602d
...@@ -6,6 +6,7 @@ import { EXTERNAL_LINKS } from '../../config/constants'; ...@@ -6,6 +6,7 @@ import { EXTERNAL_LINKS } from '../../config/constants';
import { AuthService } from '../../services/auth.service'; import { AuthService } from '../../services/auth.service';
import { ToasterService } from '../../services/toaster.service'; import { ToasterService } from '../../services/toaster.service';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { HelperService } from '../../services/helper.service';
@Component({ @Component({
selector: 'app-forgot-password', selector: 'app-forgot-password',
...@@ -25,14 +26,15 @@ export class ForgotPasswordComponent extends BaseComponent { ...@@ -25,14 +26,15 @@ export class ForgotPasswordComponent extends BaseComponent {
constructor( constructor(
private toasterService: ToasterService, private toasterService: ToasterService,
private authService: AuthService, private authService: AuthService,
private utilsService: UtilsService private utilsService: UtilsService,
private helperService: HelperService
) { ) {
super(); super();
} }
forgot(): void { forgot(): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.isLoading = true; this.isLoading = true;
this.authService.forgot(this.forgotForm) this.authService.forgot(this.forgotForm)
......
...@@ -7,6 +7,7 @@ import { BaseComponent } from '../../base/base.component'; ...@@ -7,6 +7,7 @@ import { BaseComponent } from '../../base/base.component';
import { EXTERNAL_LINKS } from '../../config/constants'; import { EXTERNAL_LINKS } from '../../config/constants';
import { AuthService } from '../../services/auth.service'; import { AuthService } from '../../services/auth.service';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { HelperService } from '../../services/helper.service';
@Component({ @Component({
selector: 'app-login', selector: 'app-login',
...@@ -28,14 +29,15 @@ export class LoginComponent extends BaseComponent { ...@@ -28,14 +29,15 @@ export class LoginComponent extends BaseComponent {
private authService: AuthService, private authService: AuthService,
private router: Router, private router: Router,
private appService: AppService, private appService: AppService,
private utilsService: UtilsService private utilsService: UtilsService,
private helperService: HelperService
) { ) {
super(); super();
} }
login(): void { login(): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.isLoading = true; this.isLoading = true;
this.authService.login(this.loginForm) this.authService.login(this.loginForm)
......
...@@ -7,6 +7,7 @@ import { EXTERNAL_LINKS } from '../../config/constants'; ...@@ -7,6 +7,7 @@ import { EXTERNAL_LINKS } from '../../config/constants';
import { AuthService } from '../../services/auth.service'; import { AuthService } from '../../services/auth.service';
import { ToasterService } from '../../services/toaster.service'; import { ToasterService } from '../../services/toaster.service';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { HelperService } from '../../services/helper.service';
@Component({ @Component({
selector: 'app-register', selector: 'app-register',
...@@ -35,14 +36,15 @@ export class RegisterComponent extends BaseComponent { ...@@ -35,14 +36,15 @@ export class RegisterComponent extends BaseComponent {
private authService: AuthService, private authService: AuthService,
private toasterService: ToasterService, private toasterService: ToasterService,
private router: Router, private router: Router,
private utilsService: UtilsService private utilsService: UtilsService,
private helperService: HelperService
) { ) {
super(); super();
} }
register(): void { register(): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.registerForm.email = this.registerForm.username; this.registerForm.email = this.registerForm.username;
if (!this.registerForm.was_referred) { if (!this.registerForm.was_referred) {
......
...@@ -7,6 +7,7 @@ import { AuthService } from '../../services/auth.service'; ...@@ -7,6 +7,7 @@ import { AuthService } from '../../services/auth.service';
import { ToasterService } from '../../services/toaster.service'; import { ToasterService } from '../../services/toaster.service';
import { EXTERNAL_LINKS } from '../../config/constants'; import { EXTERNAL_LINKS } from '../../config/constants';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { HelperService } from '../../services/helper.service';
@Component({ @Component({
selector: 'app-reset-password', selector: 'app-reset-password',
...@@ -30,6 +31,7 @@ export class ResetPasswordComponent extends BaseComponent implements OnInit { ...@@ -30,6 +31,7 @@ export class ResetPasswordComponent extends BaseComponent implements OnInit {
private toasterService: ToasterService, private toasterService: ToasterService,
private authService: AuthService, private authService: AuthService,
private utilsService: UtilsService, private utilsService: UtilsService,
private helperService: HelperService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -47,7 +49,7 @@ export class ResetPasswordComponent extends BaseComponent implements OnInit { ...@@ -47,7 +49,7 @@ export class ResetPasswordComponent extends BaseComponent implements OnInit {
reset(): void { reset(): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
const formData = {resetToken: this.resetToken, newPassword: this.resetForm.password}; const formData = {resetToken: this.resetToken, newPassword: this.resetForm.password};
this.isLoading = true; this.isLoading = true;
......
...@@ -9,6 +9,7 @@ import { takeUntil } from 'rxjs/operators'; ...@@ -9,6 +9,7 @@ import { takeUntil } from 'rxjs/operators';
import { CertificationModel, EducationModel } from '../../../models/education.model'; import { CertificationModel, EducationModel } from '../../../models/education.model';
import { environment } from '../../../../../environments/environment'; import { environment } from '../../../../../environments/environment';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { HelperService } from '../../../services/helper.service';
@Component({ @Component({
selector: 'app-education', selector: 'app-education',
...@@ -30,6 +31,7 @@ export class EducationComponent extends BaseComponent implements OnInit { ...@@ -30,6 +31,7 @@ export class EducationComponent extends BaseComponent implements OnInit {
private personalDetailsService: PersonalDetailsService, private personalDetailsService: PersonalDetailsService,
private confirmationService: ConfirmationService, private confirmationService: ConfirmationService,
private utilsService: UtilsService, private utilsService: UtilsService,
private helperService: HelperService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -81,7 +83,7 @@ export class EducationComponent extends BaseComponent implements OnInit { ...@@ -81,7 +83,7 @@ export class EducationComponent extends BaseComponent implements OnInit {
saveEducation(customRoute = null): void { saveEducation(customRoute = null): void {
if (this.form.invalid) { if (this.form.invalid) {
this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.careerProfile.EducationCertificates.forEach(exp => { this.careerProfile.EducationCertificates.forEach(exp => {
if (typeof exp.Certification === 'string') { if (typeof exp.Certification === 'string') {
......
...@@ -8,6 +8,7 @@ import { ConfirmationService } from 'primeng/api'; ...@@ -8,6 +8,7 @@ import { ConfirmationService } from 'primeng/api';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { CareerSkillModel, SkillModel } from '../../../models/career-skill.model'; import { CareerSkillModel, SkillModel } from '../../../models/career-skill.model';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { HelperService } from '../../../services/helper.service';
@Component({ @Component({
selector: 'app-skills', selector: 'app-skills',
...@@ -28,6 +29,7 @@ export class SkillsComponent extends BaseComponent implements OnInit { ...@@ -28,6 +29,7 @@ export class SkillsComponent extends BaseComponent implements OnInit {
private personalDetailsService: PersonalDetailsService, private personalDetailsService: PersonalDetailsService,
private confirmationService: ConfirmationService, private confirmationService: ConfirmationService,
private utilsService: UtilsService, private utilsService: UtilsService,
private helperService: HelperService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -95,7 +97,7 @@ export class SkillsComponent extends BaseComponent implements OnInit { ...@@ -95,7 +97,7 @@ export class SkillsComponent extends BaseComponent implements OnInit {
saveSkill(customRoute = null): void { saveSkill(customRoute = null): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.isSaving = true; this.isSaving = true;
this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs) this.personalDetailsService.saveProfile(this.createdObjs, this.updatedObjs, this.deletedObjs)
......
...@@ -8,6 +8,7 @@ import { WorkExperienceModel } from '../../../models/work-experience.model'; ...@@ -8,6 +8,7 @@ import { WorkExperienceModel } from '../../../models/work-experience.model';
import { NgForm } from '@angular/forms'; import { NgForm } from '@angular/forms';
import { ConfirmationService } from 'primeng/api'; import { ConfirmationService } from 'primeng/api';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { HelperService } from '../../../services/helper.service';
@Component({ @Component({
selector: 'app-work-history', selector: 'app-work-history',
...@@ -27,6 +28,7 @@ export class WorkHistoryComponent extends BaseComponent implements OnInit { ...@@ -27,6 +28,7 @@ export class WorkHistoryComponent extends BaseComponent implements OnInit {
private personalDetailsService: PersonalDetailsService, private personalDetailsService: PersonalDetailsService,
private confirmationService: ConfirmationService, private confirmationService: ConfirmationService,
private utilsService: UtilsService, private utilsService: UtilsService,
private helperService: HelperService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -88,7 +90,7 @@ export class WorkHistoryComponent extends BaseComponent implements OnInit { ...@@ -88,7 +90,7 @@ export class WorkHistoryComponent extends BaseComponent implements OnInit {
saveWorkHistory(customRoute = null): void { saveWorkHistory(customRoute = null): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.careerProfile.WorkExperiences.forEach(exp => { this.careerProfile.WorkExperiences.forEach(exp => {
exp.StartMonth = UtilsService.convertDateToString(exp.StartMonthField); exp.StartMonth = UtilsService.convertDateToString(exp.StartMonthField);
......
...@@ -8,6 +8,7 @@ import { PersonalDetailsService } from '../../services/personal-details.service' ...@@ -8,6 +8,7 @@ import { PersonalDetailsService } from '../../services/personal-details.service'
import { CareerProfileModel } from '../../models/career-profile.model'; import { CareerProfileModel } from '../../models/career-profile.model';
import { IntroLetterService } from '../../services/intro-letter.service'; import { IntroLetterService } from '../../services/intro-letter.service';
import { NgForm } from '@angular/forms'; import { NgForm } from '@angular/forms';
import { HelperService } from '../../services/helper.service';
@Component({ @Component({
selector: 'app-intro-letter', selector: 'app-intro-letter',
...@@ -28,6 +29,7 @@ export class IntroLetterComponent extends BaseComponent implements OnInit { ...@@ -28,6 +29,7 @@ export class IntroLetterComponent extends BaseComponent implements OnInit {
private personalDetailsService: PersonalDetailsService, private personalDetailsService: PersonalDetailsService,
private introLetterService: IntroLetterService, private introLetterService: IntroLetterService,
private utilsService: UtilsService, private utilsService: UtilsService,
private helperService: HelperService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -81,7 +83,7 @@ export class IntroLetterComponent extends BaseComponent implements OnInit { ...@@ -81,7 +83,7 @@ export class IntroLetterComponent extends BaseComponent implements OnInit {
saveIntroLetter(): void { saveIntroLetter(): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.isLoading = true; this.isLoading = true;
this.introLetterService.saveIntroLetters(this.createdObjs, this.updatedObjs, this.deletedObjs) this.introLetterService.saveIntroLetters(this.createdObjs, this.updatedObjs, this.deletedObjs)
......
...@@ -8,6 +8,7 @@ import { PersonalDetailsService } from '../../services/personal-details.service' ...@@ -8,6 +8,7 @@ import { PersonalDetailsService } from '../../services/personal-details.service'
import { ToasterService } from '../../services/toaster.service'; import { ToasterService } from '../../services/toaster.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { UtilsService } from '../../../oneit/services/utils.service'; import { UtilsService } from '../../../oneit/services/utils.service';
import { HelperService } from '../../services/helper.service';
@Component({ @Component({
selector: 'app-personal-details', selector: 'app-personal-details',
...@@ -34,6 +35,7 @@ export class PersonalDetailsComponent extends BaseComponent implements OnInit { ...@@ -34,6 +35,7 @@ export class PersonalDetailsComponent extends BaseComponent implements OnInit {
private toasterService: ToasterService, private toasterService: ToasterService,
private appService: AppService, private appService: AppService,
private utilsService: UtilsService, private utilsService: UtilsService,
private helperService: HelperService,
private router: Router private router: Router
) { ) {
super(); super();
...@@ -103,7 +105,7 @@ export class PersonalDetailsComponent extends BaseComponent implements OnInit { ...@@ -103,7 +105,7 @@ export class PersonalDetailsComponent extends BaseComponent implements OnInit {
updateProfile(customRoute = null): void { updateProfile(customRoute = null): void {
if (this.form.invalid) { if (this.form.invalid) {
return this.utilsService.showAllErrorMessages(); this.helperService.validateAllFormFields(this.form);
} }
this.careerProfile.Candidate.User.UserName = this.careerProfile.Candidate.User.Email; this.careerProfile.Candidate.User.UserName = this.careerProfile.Candidate.User.Email;
this.isSaving = true; this.isSaving = true;
......
...@@ -10,6 +10,7 @@ import { MyCareerWebRouting } from './my-career-web.routing'; ...@@ -10,6 +10,7 @@ import { MyCareerWebRouting } from './my-career-web.routing';
import { AuthService } from './services/auth.service'; import { AuthService } from './services/auth.service';
import { WelcomeComponent } from './welcome/welcome.component'; import { WelcomeComponent } from './welcome/welcome.component';
import { OneITModule } from '../oneit/oneit.module'; import { OneITModule } from '../oneit/oneit.module';
import { HelperService } from './services/helper.service';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -21,6 +22,7 @@ import { OneITModule } from '../oneit/oneit.module'; ...@@ -21,6 +22,7 @@ import { OneITModule } from '../oneit/oneit.module';
providers: [ providers: [
AuthService, AuthService,
MessageService, MessageService,
HelperService,
PublicGuard, PublicGuard,
HomeGuard HomeGuard
], ],
......
import { Injectable } from '@angular/core';
import { FormArray, FormControl, FormGroup } from '@angular/forms';
@Injectable()
export class HelperService {
validateAllFormFields(form?: any): void {
const formObj = typeof form.form ? form.form : form;
Object
.keys(form.controls)
.forEach(field => {
const control = formObj.get(field);
if (control instanceof FormControl) {
control.markAsDirty({onlySelf: true});
control.markAsTouched({onlySelf: true});
} else if (control instanceof FormGroup) {
this.validateAllFormFields(control);
} else if (control instanceof FormArray) {
control.controls.forEach(ctrl => {
if (ctrl instanceof FormControl) {
ctrl.markAsDirty({onlySelf: true});
ctrl.markAsTouched({onlySelf: true});
} else if (ctrl instanceof FormGroup) {
this.validateAllFormFields(ctrl);
}
});
}
});
}
}
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
}, },
"showMenuIcon": true, "showMenuIcon": true,
"defaultMenuIcon": "dashboard", "defaultMenuIcon": "dashboard",
"showErrorAfterTouched": true, "showErrorAfterTouched": false,
"fetchErrorMsgsFromServer": false, "fetchErrorMsgsFromServer": false,
"loadMessageSource": false, "loadMessageSource": false,
"mobileBreakpoint": 1024, "mobileBreakpoint": 1024,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment