Skip to content

Commit

Permalink
Kortsluitstroom nu ook in een kader voor de aansluiting
Browse files Browse the repository at this point in the history
  • Loading branch information
@igoethal
igoethal committed Nov 30, 2024
1 parent f161fff commit 2af4971
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 25 deletions.
2 changes: 1 addition & 1 deletion builddate.js
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
var CONF_builddate="20241130-231424"
var CONF_builddate="20241130-232032"
24 changes: 15 additions & 9 deletions eendraadschema.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2454,18 +2454,18 @@ var Aansluiting = /** @class */ (function (_super) {
case "differentieel":
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage', 3) + "mA"
+ ", Type:" + this.selectPropToHTML('type_differentieel', ["", "A", "B"])
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
break;
case "automatisch":
output += ", Curve:" + this.selectPropToHTML('curve_automaat', ["", "B", "C", "D"])
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA";
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA";
break;
case "differentieelautomaat":
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage', 3) + "mA"
+ ", Curve:" + this.selectPropToHTML('curve_automaat', ["", "B", "C", "D"])
+ ", Type:" + this.selectPropToHTML('type_differentieel', ["", "A", "B"])
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
break;
}
Expand Down Expand Up @@ -2507,11 +2507,13 @@ var Aansluiting = /** @class */ (function (_super) {
}
// Code om kortsluitvermogen toe te voegen
if ((this.props.kortsluitvermogen != '')) {
++numlines;
numlines = numlines + 1.3;
mySVG.data += "<text x=\"" + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "\" y=\"" + (mySVG.yup - 10) + "\""
+ " transform=\"rotate(-90 " + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "," + (mySVG.yup - 10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
+ htmlspecialchars("" + (this.props.kortsluitvermogen * 1000)) + "</text>";
var rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen * 1000))) + 6;
mySVG.data += '<rect x="' + (mySVG.xleft + 15 + 11 * (numlines - 2) + 1) + '" y="' + (mySVG.yup - 10 - (rectsize / 2)) + '" width="' + (11 * 1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
}
// Genoeg plaats voorzien aan de rechterkant en eindigen
mySVG.xright = Math.max(mySVG.xright, 20 + 11 * (numlines - 1));
Expand Down Expand Up @@ -2547,11 +2549,13 @@ var Aansluiting = /** @class */ (function (_super) {
}
// Code om kortsluitvermogen toe te voegen
if ((this.props.kortsluitvermogen != '')) {
++numlines;
numlines = numlines + 1.3;
mySVG.data += "<text x=\"" + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "\" y=\"" + (mySVG.yup - 10) + "\""
+ " transform=\"rotate(-90 " + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "," + (mySVG.yup - 10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
+ htmlspecialchars("" + (this.props.kortsluitvermogen * 1000)) + "</text>";
var rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen * 1000))) + 6;
mySVG.data += '<rect x="' + (mySVG.xleft + 15 + 11 * (numlines - 2) + 1) + '" y="' + (mySVG.yup - 10 - (rectsize / 2)) + '" width="' + (11 * 1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
}
// genoeg plaats voorzien aan de rechterkant en eindigen
mySVG.xright = Math.max(mySVG.xright, 20 + 11 * (numlines - 1));
Expand Down Expand Up @@ -2595,11 +2599,13 @@ var Aansluiting = /** @class */ (function (_super) {
}
// Code om kortsluitvermogen toe te voegen
if ((this.props.kortsluitvermogen != '')) {
++numlines;
numlines = numlines + 1.3;
mySVG.data += "<text x=\"" + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "\" y=\"" + (mySVG.yup - 10) + "\""
+ " transform=\"rotate(-90 " + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "," + (mySVG.yup - 10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
+ htmlspecialchars("" + (this.props.kortsluitvermogen * 1000)) + "</text>";
var rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen * 1000))) + 6;
mySVG.data += '<rect x="' + (mySVG.xleft + 15 + 11 * (numlines - 2) + 1) + '" y="' + (mySVG.yup - 10 - (rectsize / 2)) + '" width="' + (11 * 1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
}
// genoeg plaats voorzien aan de rechterkant en eindigen
mySVG.xright = Math.max(mySVG.xright, 20 + 11 * (numlines - 1));
Expand Down
36 changes: 21 additions & 15 deletions src/List_Item/Aansluiting.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,20 @@ class Aansluiting extends Electro_Item {
case "differentieel":
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage',3) + "mA"
+ ", Type:" + this.selectPropToHTML('type_differentieel',["","A","B"])
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
break;

case "automatisch":
output += ", Curve:" + this.selectPropToHTML('curve_automaat',["","B","C","D"])
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA";
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA";
break;

case "differentieelautomaat":
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage',3) + "mA"
+ ", Curve:" + this.selectPropToHTML('curve_automaat',["","B","C","D"])
+ ", Type:" + this.selectPropToHTML('type_differentieel',["","A","B"])
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
break;

Expand Down Expand Up @@ -146,11 +146,13 @@ class Aansluiting extends Electro_Item {

// Code om kortsluitvermogen toe te voegen
if ( (this.props.kortsluitvermogen!='') ) {
++numlines;
numlines = numlines + 1.3;
mySVG.data += "<text x=\"" + (mySVG.xleft+15+11*(numlines-1)) + "\" y=\"" + (mySVG.yup-10) + "\""
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + (this.props.kortsluitvermogen*1000)) + "</text>";
let rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen*1000)))+6;
mySVG.data += '<rect x="' + (mySVG.xleft+15+11*(numlines-2)+1) + '" y="' + (mySVG.yup-10-(rectsize/2)) + '" width="' + (11*1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
}

// Genoeg plaats voorzien aan de rechterkant en eindigen
Expand Down Expand Up @@ -194,11 +196,13 @@ class Aansluiting extends Electro_Item {

// Code om kortsluitvermogen toe te voegen
if ( (this.props.kortsluitvermogen!='') ) {
++numlines;
numlines = numlines + 1.3;
mySVG.data += "<text x=\"" + (mySVG.xleft+15+11*(numlines-1)) + "\" y=\"" + (mySVG.yup-10) + "\""
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + (this.props.kortsluitvermogen*1000)) + "</text>";
let rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen*1000)))+6;
mySVG.data += '<rect x="' + (mySVG.xleft+15+11*(numlines-2)+1) + '" y="' + (mySVG.yup-10-(rectsize/2)) + '" width="' + (11*1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
}

// genoeg plaats voorzien aan de rechterkant en eindigen
Expand Down Expand Up @@ -250,11 +254,13 @@ class Aansluiting extends Electro_Item {

// Code om kortsluitvermogen toe te voegen
if ( (this.props.kortsluitvermogen!='') ) {
++numlines;
numlines = numlines + 1.3;
mySVG.data += "<text x=\"" + (mySVG.xleft+15+11*(numlines-1)) + "\" y=\"" + (mySVG.yup-10) + "\""
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
+ htmlspecialchars("" + (this.props.kortsluitvermogen*1000)) + "</text>";
let rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen*1000)))+6;
mySVG.data += '<rect x="' + (mySVG.xleft+15+11*(numlines-2)+1) + '" y="' + (mySVG.yup-10-(rectsize/2)) + '" width="' + (11*1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
}

// genoeg plaats voorzien aan de rechterkant en eindigen
Expand Down

0 comments on commit 2af4971

Please sign in to comment.