From a24f9db4b5e78e4429f9fe18ac92eea637ea3004 Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Mon, 8 Jun 2020 17:02:14 +0200
Subject: [PATCH] [WIP] subform system for PreBarrage
---
.../components/pb-schema/pb-schema.component.html | 2 +-
src/app/formulaire/definition/form-definition.ts | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/app/components/pb-schema/pb-schema.component.html b/src/app/components/pb-schema/pb-schema.component.html
index dc5af67fa..b9314c653 100644
--- a/src/app/components/pb-schema/pb-schema.component.html
+++ b/src/app/components/pb-schema/pb-schema.component.html
@@ -46,6 +46,6 @@
<div id="schema" #schema></div>
- <!-- <pre id="debug">{{ graphDef }} </pre> -->
+ <pre id="debug">{{ graphDef }} </pre>
</mat-card-content>
diff --git a/src/app/formulaire/definition/form-definition.ts b/src/app/formulaire/definition/form-definition.ts
index e37c8cd0c..dd6797765 100644
--- a/src/app/formulaire/definition/form-definition.ts
+++ b/src/app/formulaire/definition/form-definition.ts
@@ -24,7 +24,6 @@ import { TopFormulaireElementIterator } from "../form-iterator/top-element-itera
import { CalculatorResults } from "../../results/calculator-results";
import { ServiceFactory } from "../../services/service-factory";
import { PabTable } from "../elements/pab-table";
-import { PbSchema } from '../elements/pb-schema';
/**
* classe de base pour tous les formulaires
@@ -223,13 +222,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
this.kids.push(tab);
}
- private parse_pb_schema(json: {}) {
- const sch: PbSchema = new PbSchema(this);
- sch.parseConfig(json);
- this.kids.push(sch);
- }
-
-
/**
* 1ère passe d'analyse de la configuration
*/
@@ -287,10 +279,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
this.parse_pab_table(conf);
break;
- case "pb_schema": // not generic at all
- this.parse_pb_schema(conf);
- break;
-
default:
throw new Error(`type d'objet de module de calcul ${type} non pris en charge`);
}
--
GitLab