Skip to content

Commit d9df53a

Browse files
cristianvasquezcristianvasquez
committed
Merge remote-tracking branch 'origin/feature/4.2.0-rc.1' into develop
# Conflicts: # implementation/eAccess/shacl_shapes/eAccess_shapes.rdf # implementation/eAccess/shacl_shapes/eAccess_shapes.ttl # implementation/eCatalogue/shacl_shapes/eCatalogue_shapes.rdf # implementation/eCatalogue/shacl_shapes/eCatalogue_shapes.ttl # implementation/eContract/shacl_shapes/eContract_shapes.rdf # implementation/eContract/shacl_shapes/eContract_shapes.ttl # implementation/eFulfilment/shacl_shapes/eFulfilment_shapes.rdf # implementation/eFulfilment/shacl_shapes/eFulfilment_shapes.ttl # implementation/eNotice/shacl_shapes/eNotice_shapes.rdf # implementation/eNotice/shacl_shapes/eNotice_shapes.ttl # implementation/eOrdering/shacl_shapes/eOrdering_shapes.rdf # implementation/eOrdering/shacl_shapes/eOrdering_shapes.ttl # implementation/ePO_core/shacl_shapes/ePO_core_shapes.rdf # implementation/ePO_core/shacl_shapes/ePO_core_shapes.ttl # implementation/eSubmission/shacl_shapes/eSubmission_shapes.rdf # implementation/eSubmission/shacl_shapes/eSubmission_shapes.ttl
2 parents f788e33 + f716720 commit d9df53a

File tree

114 files changed

+49291
-20045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+49291
-20045
lines changed

‎.github/workflows/transform_epo.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- "implementation/eContract/xmi_conceptual_model/eContract.xml"
1515
- "implementation/eContract/xmi_conceptual_model/eAccess.xml"
1616
- "implementation/eContract/xmi_conceptual_model/eSubmission.xml"
17+
- "implementation/eContract/xmi_conceptual_model/eInvoicing.xml"
1718
jobs:
1819
report_and_glossary:
1920
runs-on: ubuntu-latest
@@ -35,7 +36,7 @@ jobs:
3536

3637
- name: generate convention report and glossary
3738
run: |
38-
AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
39+
AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
3940
for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
4041
do
4142
echo "-------------------${implementation}---------------------------------"
@@ -68,7 +69,7 @@ jobs:
6869

6970
- name: merge implementations xmi files into one
7071
run: |
71-
AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
72+
AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
7273
cd model2owl
7374
mkdir -p merge-xmis
7475
for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
@@ -148,7 +149,7 @@ jobs:
148149

149150
- name: transform step
150151
run: |
151-
AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
152+
AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
152153
for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
153154
do
154155
echo "-------------------${implementation} transform---------------------------------"

‎analysis_and_design/conceptual_model/ePO_CM.eap

1.09 MB
Binary file not shown.

‎glossary/eCatalogue_glossary.html

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -287,17 +287,25 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
287287
<td>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [0..1]<br></td>
288288
</tr>
289289
<tr>
290-
<td>epo-cat:Brand<br>epo-cat:ItemModel<br>epo-cat:Item<br></td>
290+
<td>epo-cat:Brand<br>epo-cat:ItemProperty<br>epo-cat:ItemModel<br>epo-cat:Item<br></td>
291291
<td>dct:title</td>
292292
<td>A name given to the resource.
293293

294294
WG approval 30/05/2023
295-
A name given to the resource.
295+
A name given to the resource.
296296

297297
WG approval 30/05/2023 A name given to the resource.
298298

299299
WG approval 30/05/2023</td>
300-
<td>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [1..1]<br></td>
300+
<td>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [0..1]<br>rdf:PlainLiteral [1..1]<br>rdf:PlainLiteral [1..1]<br></td>
301+
</tr>
302+
<tr>
303+
<td>epo-cat:Line</td>
304+
<td>epo:hasAdditionalInformation</td>
305+
<td>Supplementary data about the instance of the concept.
306+
307+
WG Approval 15/10/2019</td>
308+
<td>rdf:PlainLiteral [0..1]</td>
301309
</tr>
302310
<tr>
303311
<td>epo-cat:ItemProperty</td>
@@ -311,7 +319,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
311319

312320

313321
WG approval 28/07/2022</td>
314-
<td>rdf:PlainLiteral [1..1]</td>
322+
<td>rdf:PlainLiteral [0..1]</td>
315323
</tr>
316324
<tr>
317325
<td>epo-cat:Batch</td>
@@ -333,7 +341,7 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
333341

334342
WG approval 28/07/2022
335343
</td>
336-
<td>rdf:PlainLiteral [1..1]</td>
344+
<td>rdf:PlainLiteral [0..1]</td>
337345
</tr>
338346
<tr>
339347
<td>epo-cat:Item</td>
@@ -819,8 +827,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
819827
</tr>
820828
<tr>
821829
<td>epo-cat:hasPrice</td>
822-
<td> </td>
823-
<td>epo-ord:OrderLine (external) -&gt; epo-cat:Price [0..1]<br>epo-cat:CatalogueLine -&gt; epo-cat:Price [1..*]<br></td>
830+
<td> </td>
831+
<td>epo-inv:InvoiceLine (external) -&gt; epo-cat:Price [1..*]<br>epo-ord:OrderLine (external) -&gt; epo-cat:Price [0..*]<br>epo-cat:CatalogueLine -&gt; epo-cat:Price [1..*]<br></td>
824832
</tr>
825833
<tr>
826834
<td>epo-cat:hasPriceType</td>
@@ -926,8 +934,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
926934
</tr>
927935
<tr>
928936
<td>epo-cat:specifiesChargeInformation</td>
929-
<td></td>
930-
<td>epo-ord:Order (external) -&gt; epo-cat:ChargeInformation [0..*]</td>
937+
<td> </td>
938+
<td>epo-inv:Invoice (external) -&gt; epo-cat:ChargeInformation [0..*]<br>epo-ord:Order (external) -&gt; epo-cat:ChargeInformation [0..*]<br></td>
931939
</tr>
932940
<tr>
933941
<td>epo-cat:specifiesItem</td>
@@ -939,11 +947,33 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
939947
<td></td>
940948
<td>epo-ful:Consignment (external) -&gt; epo-cat:ChargeInformation [0..*]</td>
941949
</tr>
950+
<tr>
951+
<td>epo-ful:hasFreightCharge</td>
952+
<td>The total cost for moving the goods.
953+
954+
WG approval 18/06/2024</td>
955+
<td>epo-ful:Consignment (external) -&gt; epo-cat:ChargeInformation [0..*]</td>
956+
</tr>
957+
<tr>
958+
<td>epo-inv:hasItemClassificationIdentifier</td>
959+
<td></td>
960+
<td>epo-cat:Item -&gt; adms:Identifier (external) [0..*]</td>
961+
</tr>
962+
<tr>
963+
<td>epo-inv:isSpecificToInvoiceLine</td>
964+
<td></td>
965+
<td>epo-cat:ChargeInformation -&gt; epo-inv:InvoiceLine (external) [0..*]</td>
966+
</tr>
942967
<tr>
943968
<td>epo-ord:hasAcceptanceStatus</td>
944969
<td></td>
945970
<td>epo-cat:CatalogueResponseInformation -&gt; at-voc-new:ResponseStatus (external) [1]</td>
946971
</tr>
972+
<tr>
973+
<td>epo-ord:hasGrossMonetaryValue</td>
974+
<td></td>
975+
<td>epo-cat:Price -&gt; epo:MonetaryValue (external) [0..1]</td>
976+
</tr>
947977
<tr>
948978
<td>epo-ord:hasPriceDiscountInformation</td>
949979
<td></td>

0 commit comments

Comments
 (0)