ROENROLL-1977 what if degree plan fix

src/app/dars/new-what-if-audit-dialog/new-what-if-audit-dialog.component.ts

@@ -256,8 +256,14 @@ export class NewWhatIfAuditDialogComponent implements OnInit {
 
   public degreePlannerPlanName<T>(fallback: T): string | T {
     const control = this.chosenAuditSettings.get('degreePlan');
-    if (control && control.value !== null) {
-      return control.value.name;
+    const coursesControl = this.chosenAuditSettings.get('includeCoursesFrom');
+
+    if (coursesControl && coursesControl.value === 'planned') {
+      if (control && control.value !== null) {
+        return control.value.name;
+      } else {
+        return fallback;
+      }
     } else {
       return fallback;
     }
@@ -274,14 +280,9 @@ export class NewWhatIfAuditDialogComponent implements OnInit {
 
   // If a degree plan name is included in the request we do not need this property
   public includeCoursesFrom<T>(fallback: T): string | T {
-    const controlDegreePlan = this.chosenAuditSettings.get('degreePlan');
-    if (controlDegreePlan && controlDegreePlan.status === 'DISABLED') {
-      const control = this.chosenAuditSettings.get('includeCoursesFrom');
-      if (control !== null) {
-        return control.value.toString();
-      } else {
-        return fallback;
-      }
+    const control = this.chosenAuditSettings.get('includeCoursesFrom');
+    if (control && control.value !== 'planned') {
+      return control.value.toString();
     } else {
       return fallback;
     }