fix

Signed-off-by: Stepan Kiryakov <[email protected]>
hashgraph · Oct 9, 2024 · f93b1ef · f93b1ef
1 parent c851ab5
commit f93b1ef
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 22 deletions.
diff --git a/frontend/src/app/modules/policy-statistics/models/schema-formulas.ts b/frontend/src/app/modules/policy-statistics/models/schema-formulas.ts
@@ -95,6 +95,6 @@ export class SchemaFormulas {
  }
 
  public getJson(): any[] {
- return this.formulas.map((f) => f.getJson());
+ return this.formulas.filter((f) => f.description || f.formula).map((f) => f.getJson());
  }
 }
diff --git a/...tics/statistic-assessment-configuration/statistic-assessment-configuration.component.html b/...tics/statistic-assessment-configuration/statistic-assessment-configuration.component.html
@@ -240,13 +240,13 @@
  <ng-container *ngIf="variable.isArray">
  <div class="field-value-array">
  <div *ngFor="let v of variable.value" class="field-value">
- {{v}}
+ {{getVariableValue(v)}}
  </div>
  </div>
  </ng-container>
  <ng-container *ngIf="!variable.isArray">
  <div class="field-value">
- {{variable.value}}
+ {{getVariableValue(variable.value)}}
  </div>
  </ng-container>
  </div>
@@ -266,13 +266,13 @@
  <ng-container *ngIf="variable.isArray">
  <div class="field-value-array">
  <div *ngFor="let v of variable.value" class="field-value">
- {{v}}
+ {{getVariableValue(v)}}
  </div>
  </div>
  </ng-container>
  <ng-container *ngIf="!variable.isArray">
  <div class="field-value">
- {{variable.value}}
+ {{getVariableValue(variable.value)}}
  </div>
  </ng-container>
  </div>
@@ -313,13 +313,13 @@
  <ng-container *ngIf="variable.isArray">
  <div class="field-value-array">
  <div *ngFor="let v of variable.value" class="field-value">
- {{v}}
+ {{getVariableValue(v)}}
  </div>
  </div>
  </ng-container>
  <ng-container *ngIf="!variable.isArray">
  <div class="field-value">
- {{variable.value}}
+ {{getVariableValue(variable.value)}}
  </div>
  </ng-container>
  </div>

diff --git a/...istics/statistic-assessment-configuration/statistic-assessment-configuration.component.ts b/...istics/statistic-assessment-configuration/statistic-assessment-configuration.component.ts
@@ -323,7 +323,7 @@ export class StatisticAssessmentConfigurationComponent implements OnInit {
  } else if (result.length === 1) {
  return result[0];
  } else {
- return 'N/A';
+ return undefined;
  }
  }
 
@@ -337,16 +337,12 @@ export class StatisticAssessmentConfigurationComponent implements OnInit {
  if (value) {
  value = value[path[i]]
  } else {
- return '';
+ return undefined;
  }
  }
- if (value) {
- return value;
- } else {
- return '';
- }
+ return value;
  } else {
- return 'N/A';
+ return undefined;
  }
  }
 
@@ -380,7 +376,7 @@ export class StatisticAssessmentConfigurationComponent implements OnInit {
  if (!this.document) {
  return;
  }
- if(this.scores && this.scores.length) {
+ if (this.scores && this.scores.length) {
  this.onStep(2);
  } else {
  this.onNextFinish();
@@ -422,12 +418,14 @@ export class StatisticAssessmentConfigurationComponent implements OnInit {
 
  for (const formula of this.formulas) {
  formula.value = this.calcFormula(formula, document);
- if (formula.type === 'string') {
- formula.value = String(formula.value);
- } else {
- formula.value = Number(formula.value);
+ if (formula.value) {
+ if (formula.type === 'string') {
+ formula.value = String(formula.value);
+ } else {
+ formula.value = Number(formula.value);
+ }
+ document[formula.id] = formula.value;
  }
- document[formula.id] = formula.value;
  }
  }
 
@@ -453,7 +451,9 @@ export class StatisticAssessmentConfigurationComponent implements OnInit {
  const document: any = {};
 
  for (const field of this.preview) {
- document[field.id] = field.value;
+ if (field.value !== undefined) {
+ document[field.id] = field.value;
+ }
  }
  for (const score of this.scores) {
  const option = score.options.find((o) => o.value === score.value);
@@ -486,4 +486,12 @@ export class StatisticAssessmentConfigurationComponent implements OnInit {
  };
  return report;
  }
+
+ public getVariableValue(value: any): any {
+ if (value === undefined) {
+ return 'N/A';
+ } else {
+ return value;
+ }
+ }
 }