diff --git a/CHANGES.md b/CHANGES.md
index e002dcaa6dc2f94b1a6070d96af12487f89b644e..0dad9afa1f0f93dface562f1867a6188f00f9e73 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,24 @@
+**VECTO v4.3.3 Official Release (04-03-2025)**
+
+
+- Bug Fixes
+
+ * CodeEU #950: Check if XML element is signed (#950) (vecto/vecto!314)
+ * CodeEU #954: NgTankSystem optional for HEV lorries MRF XSD (vecto/vecto!315)
+ * fix: monitoring report for dual fuel vehicles (vecto/vecto!318)
+ * fix: secure XML loading against external entity injection (vecto/vecto!319)
+ * fix: correct interim supercap reader type (vecto/vecto!320)
+ * fix: parameter IDs for XSDs v2.3 and v2.6 (vecto/vecto!322)
+
+- Documentation
+
+ * CodeEU n.a.: Update XSD parameter IDs documentation (vecto/vecto!327)
+
+
+
**VECTO v4.3.3 Official Release (03-03-2025)**
diff --git a/Documentation/User Manual Source/Release Notes Vecto4.x.pdf b/Documentation/User Manual Source/Release Notes Vecto4.x.pdf
index c0e90587628612667dd1f2f2d689a7aee4efd10f..fde31e2f487b03074d4baa72e3c4f8b8579be1ad 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto4.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto4.x.pdf differ
diff --git a/Documentation/User Manual Source/ReleaseNotesMDs/ReleaseNotesVecto4x.md b/Documentation/User Manual Source/ReleaseNotesMDs/ReleaseNotesVecto4x.md
index 769a8d206a7e9e967c7a5b4eb1a6ee2562407a95..0db6477feed86672d6d4f28ae410b8411e78c919 100644
--- a/Documentation/User Manual Source/ReleaseNotesMDs/ReleaseNotesVecto4x.md
+++ b/Documentation/User Manual Source/ReleaseNotesMDs/ReleaseNotesVecto4x.md
@@ -6,6 +6,30 @@
+# VECTO v4.3.3 Official Release (04-03-2025)
+
+
+## Bug Fixes
+
+- Check if XML element is signed (#950) (vecto/vecto!314)
+
+- NgTankSystem optional for HEV lorries MRF XSD (vecto/vecto!315)
+
+- fix: monitoring report for dual fuel vehicles (vecto/vecto!318)
+
+- fix: secure XML loading against external entity injection (vecto/vecto!319)
+
+- fix: correct interim supercap reader type (vecto/vecto!320)
+
+- fix: parameter IDs for XSDs v2.3 and v2.6 (vecto/vecto!322)
+
+## Documentation
+
+- Update XSD parameter IDs documentation (vecto/vecto!327)
+
+
+
+
# VECTO v4.3.3 Official Release (03-03-2025)
diff --git a/Documentation/User Manual Source/ReleaseNotesMDs/release_notes.md b/Documentation/User Manual Source/ReleaseNotesMDs/release_notes.md
index 5d66ec565caa4e724d1393085e88821f28b0f9ee..ce32d3532a536c6508d83aac2cb8c4adcf26a4b1 100644
--- a/Documentation/User Manual Source/ReleaseNotesMDs/release_notes.md
+++ b/Documentation/User Manual Source/ReleaseNotesMDs/release_notes.md
@@ -1,5 +1,5 @@
-## VECTO v4.3.3 Official Release (03-03-2025)
+## VECTO v4.3.3 Official Release (04-03-2025)
### Bug Fixes
@@ -16,3 +16,7 @@
- fix: parameter IDs for XSDs v2.3 and v2.6 (vecto/vecto!322)
+### Documentation
+
+- Update XSD parameter IDs documentation (vecto/vecto!327)
+
diff --git a/Documentation/User Manual/6-changelog/changelog.md b/Documentation/User Manual/6-changelog/changelog.md
index e002dcaa6dc2f94b1a6070d96af12487f89b644e..0dad9afa1f0f93dface562f1867a6188f00f9e73 100644
--- a/Documentation/User Manual/6-changelog/changelog.md
+++ b/Documentation/User Manual/6-changelog/changelog.md
@@ -2,6 +2,24 @@
+**VECTO v4.3.3 Official Release (04-03-2025)**
+
+
+- Bug Fixes
+
+ * CodeEU #950: Check if XML element is signed (#950) (vecto/vecto!314)
+ * CodeEU #954: NgTankSystem optional for HEV lorries MRF XSD (vecto/vecto!315)
+ * fix: monitoring report for dual fuel vehicles (vecto/vecto!318)
+ * fix: secure XML loading against external entity injection (vecto/vecto!319)
+ * fix: correct interim supercap reader type (vecto/vecto!320)
+ * fix: parameter IDs for XSDs v2.3 and v2.6 (vecto/vecto!322)
+
+- Documentation
+
+ * CodeEU n.a.: Update XSD parameter IDs documentation (vecto/vecto!327)
+
+
+
**VECTO v4.3.3 Official Release (03-03-2025)**
diff --git a/Documentation/User Manual/help.html b/Documentation/User Manual/help.html
index 85c6b51e1e8bc5e3543afd5005cf1498c59bd4ee..59919c0916562db6db9bb954b56ee17562f7f359 100644
--- a/Documentation/User Manual/help.html
+++ b/Documentation/User Manual/help.html
@@ -11000,6 +11000,26 @@ stored as LOG_backup.txt.</p>
</section>
<section id="changelog" class="level1">
<h1>Changelog</h1>
+<p><strong>VECTO v4.3.3 Official Release (04-03-2025)</strong></p>
+<ul>
+<li><p>Bug Fixes</p>
+<ul>
+<li>CodeEU #950: Check if XML element is signed (#950)
+(vecto/vecto!314)</li>
+<li>CodeEU #954: NgTankSystem optional for HEV lorries MRF XSD
+(vecto/vecto!315)</li>
+<li>fix: monitoring report for dual fuel vehicles (vecto/vecto!318)</li>
+<li>fix: secure XML loading against external entity injection
+(vecto/vecto!319)</li>
+<li>fix: correct interim supercap reader type (vecto/vecto!320)</li>
+<li>fix: parameter IDs for XSDs v2.3 and v2.6 (vecto/vecto!322)</li>
+</ul></li>
+<li><p>Documentation</p>
+<ul>
+<li>CodeEU n.a.: Update XSD parameter IDs documentation
+(vecto/vecto!327)</li>
+</ul></li>
+</ul>
<p><strong>VECTO v4.3.3 Official Release (03-03-2025)</strong></p>
<ul>
<li><p>Bug Fixes</p>
diff --git a/Documentation/XML/ParameterDocumentation/VectoParameterDocumentation.html b/Documentation/XML/ParameterDocumentation/VectoParameterDocumentation.html
index 230747de9c62968c6e385658e1778cd0058032dc..516e132074f6314a2c081d5c104feb96b4914ea8 100644
--- a/Documentation/XML/ParameterDocumentation/VectoParameterDocumentation.html
+++ b/Documentation/XML/ParameterDocumentation/VectoParameterDocumentation.html
@@ -30,11 +30,11 @@
onclick="openTab(event, 'AnonymousTypes')">
Anonymous Types
</button>
- <button if="btn_missing"
+ <!-- <button if="btn_missing"
class="btn btn-info tablinks"
onclick="openTab(event, 'MissingTypes')">
Missing Types
- </button>
+ </button> -->
</div>
<!-- Tab content -->
@@ -82,14 +82,14 @@
</table>
</div>
- <div id="MissingTypes" class="tabcontent">
+ <!-- <div id="MissingTypes" class="tabcontent">
<table id=missingTypesTable class="table table-striped table-hover hidden">
<thead>
</thead>
<tbody>
</tbody>
</table>
- </div>
+ </div> -->
<script>
function openTab(evt, tabName) {
@@ -143,16 +143,16 @@
<script type="text/javascript">
const mergedTypesData = mergedTypes;
const anonymousTypesData = anonymousTypes;
- const missingTypesData = missingTypes;
+ //const missingTypesData = missingTypes;
var topBarHeight = 0;
</script>
<script>
$( document ).ready(function() {
- console.log( "ready!" );
- console.log( "Init tables!");
+ // console.log( "ready!" );
+ // console.log( "Init tables!");
topBarHeight = $( "#topContainer" ).outerHeight();
- console.log(topBarHeight);
+ // console.log(topBarHeight);
initTables();
});
@@ -332,10 +332,10 @@
function getBackgroundClass(modeEnum){
var classes = [
+ 'bg-red', //undefined
'bg-green', //Declaration
'bg-yellow', //Engineering
'bg-blue', //Declaration and Engineering
- 'bg-red', //undefined
]
return classes[modeEnum]
@@ -393,8 +393,8 @@
function restrictionFormatter(index, restrictions){
var parentDiv = $('<div>');
- console.log('Restrictionformatter');
- console.log(restrictions);
+ // console.log('Restrictionformatter');
+ // console.log(restrictions);
restrictions.forEach(restriction => {
parentDiv.append(createToolTipDiv(restriction.RestrictionDescription.replace('--', '▪'),
('defined in: ' + restriction.Versions.join(',')), 'right'))
@@ -428,31 +428,38 @@
}
function xmlPathsFormatter(paths){
- console.log('xmlPathsFormatter');
- console.log(typeof(paths));
- console.log(paths);
+ // console.log('xmlPathsFormatter');
+ // console.log(typeof(paths));
+ // console.log(paths);
var parentDiv = $('<div>');
paths.forEach(path => parentDiv.append(xmlPathFormatter(path)));
return parentDiv;
}
function xmlPathFormatter(xmlPath){
- console.log('xmlPathFormatter')
- console.log(xmlPath);
+ //console.log('xmlPathFormatter')
+ //console.log(xmlPath);
var parentDiv = $('<div>').addClass('path-div').addClass(getBackgroundClass(xmlPath.Mode));
- parentDiv.append($('<div>')
- .html(xmlPath.RootNodeType.substring(0,3))
- .append(createToolTipDiv("ℹ", xmlPath.RootNodeVersion))
- );
-
- xmlPath.PathElements.forEach(pathElement => parentDiv.append(pathElementFormatter(pathElement)));
+ // parentDiv.append($('<div>')
+ // .html(xmlPath.RootNodeType.substring(0,3))
+ // .append(createToolTipDiv("ℹ", xmlPath.RootNodeVersion))
+ // );
+
+ xmlPath.PathElements.forEach(pathElement => {
+ var separator = " /";
+ if(pathElement === xmlPath.PathElements[0]){
+ parentDiv.append(pathElementFormatter(pathElement, ""));
+ }else {
+ parentDiv.append(pathElementFormatter(pathElement, separator));
+ }
+ });
return parentDiv;
}
- function pathElementFormatter(pathElement){
- console.log(pathElement);
- var pathName = " /";
+ function pathElementFormatter(pathElement, separator){
+ //console.log(pathElement);
+ var pathName = separator;
if(pathElement.IsAttribute){
pathName += '@';
}
@@ -462,7 +469,7 @@
if(pathElement.IsOptional){
pathName += '*';
}
- console.log(pathName);
+ // console.log(pathName);
var resultDiv = $('<div>').html(pathName);
resultDiv.append(
@@ -475,7 +482,7 @@
}
function createTooltipTextFromSchemaTypes(schemaTypeNames, seperator){
- console.log(schemaTypeNames);
+ // console.log(schemaTypeNames);
var result = "";
schemaTypeNames.forEach((schemaTypeName) => {
var version = getVersion(schemaTypeName.Namespace);
diff --git a/Documentation/XML/ParameterDocumentation/data.js b/Documentation/XML/ParameterDocumentation/data.js
index 4ba4b0ab6599e3786e0ab19ddfb1e5d9a9c10adc..d11c8bbfd7fb588c9dcf125a9e8b53c22b8b6f04 100644
Binary files a/Documentation/XML/ParameterDocumentation/data.js and b/Documentation/XML/ParameterDocumentation/data.js differ