Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix generated aas artifacts #107

Merged
merged 4 commits into from
Mar 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions .SAMMCLI/catena-template.css

This file was deleted.

6 changes: 3 additions & 3 deletions generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ MODELNAME="$(basename $1 .ttl)"
DIR="$(dirname "$1")"
PATHTEMPLATE=$DIR"/gen/"$MODELNAME

commands=(aas schema json openapi html)
endings=(-aas.json -aas-value-schema.json -aas-value.json .yml -aspectmodel.html)
toggles=("-f json" "" "" " -b=catenax.io" "-c $CATENAXCSS")
commands=(aas aas schema json openapi html)
endings=(-aas.xml .aasx -schema.json .json .yml .html)
toggles=("-f xml" "-f aasx" "" "" "-b=catenax.io" "-c $CATENAXCSS")

for i in ${!commands[@]}; do
echo "generate ${commands[$i]} into $PATHTEMPLATE${endings[$i]}"
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
},
"createdOn" : "2022-02-03T14:48:54.709Z",
"lastModifiedOn" : "2022-02-03T14:48:54.709Z",
"childCatenaXId" : "urn:uuid:c3caACcB-d184-323A-8C31-fdDDC43B7FdE"
"childCatenaXId" : "D4b69Cd5-9e5e-4b2E-fB07-ff51Cf049EDa"
} ]
}
Binary file added io.catenax.batch/1.0.1/gen/Batch.aasx
Binary file not shown.
Binary file added io.catenax.batch/1.0.2/gen/Batch.aasx
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"fileLocation" : "http://www.wikipedia.org"
} ]
},
"datePlacedOnMarket" : "2023-03-06T14:35:58.305+01:00",
"datePlacedOnMarket" : "2023-03-14T17:10:53.975+01:00",
"cellChemistry" : {
"electrolyteComposition" : [ {
"matierialPercentageMassFraction" : 19,
Expand Down Expand Up @@ -126,7 +126,7 @@
"technicalKey" : "BLOCK"
},
"country" : {
"shortName" : "WP-YZ"
"shortName" : ""
},
"postCode" : {
"value" : "68161\\12",
Expand Down Expand Up @@ -164,7 +164,7 @@
"technicalKey" : "BLOCK"
},
"country" : {
"shortName" : ""
"shortName" : "XH-VZ"
},
"postCode" : {
"value" : "68161\\12",
Expand Down Expand Up @@ -201,7 +201,7 @@
"technicalKey" : "BLOCK"
},
"country" : {
"shortName" : "VK-1GC"
"shortName" : ""
},
"postCode" : {
"value" : "68161\\12",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"fileLocation" : "http://www.wikipedia.org"
} ]
},
"datePlacedOnMarket" : "2023-03-06T14:36:33.836+01:00",
"datePlacedOnMarket" : "2023-03-14T17:11:22.086+01:00",
"cellChemistry" : {
"electrolyteComposition" : [ {
"matierialPercentageMassFraction" : 19,
Expand Down Expand Up @@ -126,7 +126,7 @@
"technicalKey" : "BLOCK"
},
"country" : {
"shortName" : "HH-LZF"
"shortName" : ""
},
"postCode" : {
"value" : "68161\\12",
Expand Down Expand Up @@ -165,7 +165,7 @@
"technicalKey" : "BLOCK"
},
"country" : {
"shortName" : ""
"shortName" : "BN-O"
},
"postCode" : {
"value" : "68161\\12",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"fileLocation" : "http://www.wikipedia.org"
} ]
},
"datePlacedOnMarket" : "2023-03-06T14:35:25.952+01:00",
"datePlacedOnMarket" : "2023-03-14T17:10:25.344+01:00",
"cellChemistry" : {
"electrolyteComposition" : [ {
"materialPercentageMassFraction" : 19,
Expand Down Expand Up @@ -125,7 +125,7 @@
"technicalKey" : "BLOCK"
},
"country" : {
"shortName" : ""
"shortName" : "XB-1M"
},
"postCode" : {
"value" : "68161\\12",
Expand Down Expand Up @@ -201,7 +201,7 @@
"technicalKey" : "BLOCK"
},
"country" : {
"shortName" : "QG-Q"
"shortName" : "RG-8"
},
"postCode" : {
"value" : "68161\\12",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"type" : "HVB",
"currentStateOfHealth" : [ {
"currentStateOfHealthPhase" : "as specified by OEM",
"currentStateOfHealthTimestamp" : "2023-03-06T14:42:46.730+01:00",
"currentStateOfHealthTimestamp" : "2023-03-14T17:16:42.377+01:00",
"currentStateOfHealthValue" : -1.7976931348623157E308
} ]
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{
"dismantlerProperties" : {
"expiryDate" : "2023-03-06T14:40:35.051+01:00",
"expiryDate" : "2023-03-14T17:14:48.434+01:00",
"governmentAddress" : {
"houseNumber" : "45",
"zip" : "68161/12",
"name" : "VLhpfQGTMDYpsBZxvfBoeygjb",
"country" : "MY",
"country" : "UR",
"location" : "Mannheim",
"street" : "Bernstraße"
},
"dismantlerAuditorContact" : {
"fax" : "742828 574 3109987083399058 858950463193976874 472 8339 5754400267250 7652183007014516",
"phone" : "48 2 42765498699 54 "
"fax" : "2118145186333995599 4455362573 92903453",
"phone" : "+908 0984"
},
"receiverAuditorAddress" : {
"houseNumber" : "45",
"zip" : "68161/12",
"name" : "UMaAIKKIkknjWEXJUfPxxQHeWKEJ",
"country" : "YD",
"country" : "AR",
"location" : "Mannheim",
"street" : "Bernstraße"
},
"dismantlerContact" : {
"fax" : "227702 9654380042594402050740 325016050828818508043715 0245 ",
"phone" : "+9316890473 2297422354374 0055725 5524866863 8688602 38"
"fax" : "29 013 2258035667 5403",
"phone" : " 0437170 59659481408170668550001606181190496817797071900 16680 7 6926221384 05844893247741871 583"
},
"dismantlerAuditorAddress" : {
"houseNumber" : "45",
"zip" : "68161/12",
"name" : "dpHYZGhtgdntugzvvKAXLhM",
"country" : "QS",
"country" : "GI",
"location" : "Mannheim",
"street" : "Bernstraße"
},
"dismantlerAddress" : {
"houseNumber" : "45",
"zip" : "68161/12",
"name" : "RYtGKbgicZaHCBRQDSx",
"country" : "RE",
"country" : "KQ",
"location" : "Mannheim",
"street" : "Bernstraße"
},
"issueDate" : "2023-03-06T14:40:35.051+01:00",
"issueDate" : "2023-03-14T17:14:48.434+01:00",
"isVehicleWithdrawnFromService" : false
},
"serialNumber" : "LRP1087432",
Expand All @@ -58,32 +58,32 @@
"firstRegistration" : "19.12.2014"
},
"returnPointProperties" : {
"expiryDate" : "2023-03-06T14:40:35.039+01:00",
"expiryDate" : "2023-03-14T17:14:48.428+01:00",
"receiverAddress" : {
"houseNumber" : "45",
"zip" : "68161/12",
"name" : "JxkyvRnL",
"country" : "WU",
"country" : "RV",
"location" : "Mannheim",
"street" : "Bernstraße"
},
"receiverAuditorAddress" : {
"houseNumber" : "45",
"zip" : "68161/12",
"name" : "yedUsFwdkelQbxeTeQOvaScfqIOOmaa",
"country" : "RD",
"country" : "ZE",
"location" : "Mannheim",
"street" : "Bernstraße"
},
"receiverAuditorContact" : {
"fax" : "+880984 168536540440 8698 2570696750738008922 4560064245609150028 4 475 636736414 3737",
"phone" : "67603494 6189959509413703643997470203"
"fax" : "60298704457507 9 8577 76",
"phone" : "331526303180940 34307479 92660 38225647 520855838909 01 8 72520515310573752386"
},
"receiverContact" : {
"fax" : "056242466601160 1014 3648626394 86 68 5 0601 190805 6567338",
"phone" : "23 1356019115334786 1518191099961560949819797277582367803935755404193478 8 333 6 622819"
"fax" : "4270096015 4309445925080622016597027979396859783 08514571099764 9",
"phone" : "+5585 6 2026 20021538 2747306418525503392771787 089739266209007778 279967117"
},
"issueDate" : "2023-03-06T14:40:35.039+01:00",
"issueDate" : "2023-03-14T17:14:48.427+01:00",
"isVehicleWithdrawnFromService" : true
},
"vehicleOwnerProperties" : {
Expand All @@ -92,11 +92,11 @@
"houseNumber" : "45",
"zip" : "68161/12",
"name" : "eOMtThyhVNLWUZNRcBaQKxI",
"country" : "VG",
"country" : "DI",
"location" : "Mannheim",
"street" : "Bernstraße"
},
"citizenship" : "DE"
},
"dismantlingDate" : "2023-03-06T14:40:34.997+01:00"
"dismantlingDate" : "2023-03-14T17:14:48.399+01:00"
}
Binary file not shown.
Binary file not shown.
Binary file added io.catenax.eol_story/1.0.0/gen/EndOfLife.aasx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added io.catenax.essincident/1.0.0/gen/EssIncident.aasx
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
},
"urn_bamm_io.catenax.fleet.diagnostic_data_1.0.0_Long" : {
"type" : "number",
"minimum" : -9223372036854775808,
"maximum" : 9223372036854775807
"maximum" : 9223372036854775807,
"minimum" : -9223372036854775808
},
"urn_bamm_io.catenax.fleet.diagnostic_data_1.0.0_DiagnosticTroubleCode" : {
"description" : "diagnostic trouble codes or short DTCs are used inside ECUs to monitor failures. They were introduced for measuring vehicle emissions. Major DTCs for emissions are standardized by ISO standard ISO 15031-6:2015 - so called OBD2 standard. Over time DTCs were also introduced in other ECUs also besides engine and emission control. Many DTCs are vehicle manufacturer specific.\n",
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ components:
- Info
urn_bamm_io.catenax.fleet.diagnostic_data_1.0.0_Long:
type: number
maximum: 9223372036854775807
minimum: -9223372036854775808
maximum: 9223372036854775807
urn_bamm_io.catenax.fleet.diagnostic_data_1.0.0_DiagnosticTroubleCode:
description: |
diagnostic trouble codes or short DTCs are used inside ECUs to monitor failures. They were introduced for measuring vehicle emissions. Major DTCs for emissions are standardized by ISO standard ISO 15031-6:2015 - so called OBD2 standard. Over time DTCs were also introduced in other ECUs also besides engine and emission control. Many DTCs are vehicle manufacturer specific.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"name" : "JxkyvRnL",
"publicationYear" : [ "1999" ],
"location" : "http://www.ietf.org/rfc/rfc2396.txt",
"effectiveDate" : "2023-03-06T14:41:56.332+01:00",
"expirationDate" : "2023-03-06T14:41:56.332+01:00"
"effectiveDate" : "2023-03-14T17:15:54.534+01:00",
"expirationDate" : "2023-03-14T17:15:54.534+01:00"
} ],
"availabilityDate" : "2022-03-11",
"corroded" : true,
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"nameAtManufacturer" : "Mirror left"
},
"validityPeriod" : {
"validFrom" : "2023-03-06T14:37:05.133+01:00",
"validTo" : "2023-03-06T14:37:05.135+01:00"
"validFrom" : "2023-03-14T17:11:48.148+01:00",
"validTo" : "2023-03-14T17:11:48.148+01:00"
},
"catenaXId" : "580d3adf-1981-44a0-a214-13d6ceed9379"
}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"nameAtOwner" : "Mirror left"
},
"validityPeriod" : {
"validFrom" : "2023-03-06T14:30:04.339+01:00",
"validTo" : "2023-03-06T14:30:04.340+01:00"
"validFrom" : "2023-03-14T17:05:16.909+01:00",
"validTo" : "2023-03-14T17:05:16.910+01:00"
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"nameAtOwner" : "Mirror left"
},
"validityPeriod" : {
"validFrom" : "2023-03-06T14:30:28.144+01:00",
"validTo" : "2023-03-06T14:30:28.145+01:00"
"validFrom" : "2023-03-14T17:05:37.517+01:00",
"validTo" : "2023-03-14T17:05:37.518+01:00"
}
}
Binary file not shown.
Binary file added io.catenax.pcf/2.0.0/gen/Pcf.aasx
Binary file not shown.
Loading