Fixed choosing core subject and choosing practical combination being …

…valid.
RbkGh · Feb 26, 2017 · 126d148 · 126d148
1 parent a7483ce
commit 126d148
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/app/components/main-content/subject/subject.component.ts b/src/app/components/main-content/subject/subject.component.ts
@@ -312,6 +312,7 @@ export class SubjectComponent implements OnInit {
 
  console.log(addSubjectForm);
  let yearGroupsArray: Array<number> = new Array<number>();
+ let isSubjectAPracticalSubjectConvertedToBoolean:boolean = (addSubjectForm.value.isSubjectAPracticalSubject === "true"); //convert string to boolean in javascript
  if (addSubjectForm.value.subjectYearGroupList1 === true) {
  yearGroupsArray.push(1);
  }
@@ -328,7 +329,7 @@ export class SubjectComponent implements OnInit {
  addSubjectForm.value.subjectCode,
  yearGroupsArray,
  addSubjectForm.value.subjectType,
- addSubjectForm.value.isSubjectAPracticalSubject,
+ isSubjectAPracticalSubjectConvertedToBoolean,
  null);
  }
 
@@ -383,8 +384,16 @@ export class SubjectComponent implements OnInit {
 
  public addSubject(addSubjectForm: AbstractControl): void {
 
+ let isSubjectAPracticalSubjectConvertedToBoolean:boolean = (addSubjectForm.value.isSubjectAPracticalSubject === "true"); //convert string to boolean in javascript
+ console.log("addSubjectForm.value.isSubjectAPracticalSubject ="+addSubjectForm.value.isSubjectAPracticalSubject+"Expression (addSubjectForm.value.isSubjectAPracticalSubject===true) ="+(addSubjectForm.value.isSubjectAPracticalSubject===true));
+ if(isSubjectAPracticalSubjectConvertedToBoolean === true) {
+ if(addSubjectForm.value.subjectType === this.CORE_SUBJECT_NOTATION) {
+ swal("Error","If Subject is a practical subject,it cannot be a core subject at the same time","error");
+ return ;
+ }
+ }
  let subjectJsonObject = this.prepareSubjectJson(addSubjectForm);
-
+ console.log("subjectJsonObject ==>",subjectJsonObject);
  this.accessingService = true;
  this.subjectService.createSubject(subjectJsonObject).subscribe(
  (response: TutorResponsePayload) => {