4.0.2-rc2 (#719)

* updated eap file * added eInvoicing folder; updated config parameters and namespaces; updated xml files * Adding convention report and glossary files * Adding transformation files * chore: update SHACL shapes * chore: add eInvoicing module * Update transform_epo.yml * fixed issues (#624, #688, #689) * replaced EA file with new, updated version * updated priorVersion to 4.1.1; updated paths in transform_epo.yml; updated xml files. * Adding convention report and glossary files * updated EA file (clean-up) * updated EA file (clean-up) * Added README.md files for eAccess, eInvoicing, eSubmission. Changed the README.md file under implementation. * modified main README.md to include eInvoicing * updated xml files * Adding convention report and glossary files * updated xml files * Adding convention report and glossary files * fixed typo in EA file; updated xml files * Adding convention report and glossary files * Adding transformation files --------- Co-authored-by: andreea <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: MummiaDoug <[email protected]>
OP-TED · Nov 25, 2024 · a0bfeb2 · a0bfeb2
1 parent e351a4e
commit a0bfeb2
Show file tree

Hide file tree

Showing 136 changed files with 91,478 additions and 58,955 deletions.
diff --git a/.github/workflows/transform_epo.yml b/.github/workflows/transform_epo.yml
@@ -5,15 +5,17 @@ on:
       - "**"
       - "!demo"
       - "!master"
+      - "!develop"
     paths:
       - "implementation/ePO_core/xmi_conceptual_model/ePO_core.xml"
       - "implementation/eCatalogue/xmi_conceptual_model/eCatalogue.xml"
       - "implementation/eNotice/xmi_conceptual_model/eNotice.xml"
       - "implementation/eOrdering/xmi_conceptual_model/eOrdering.xml"
       - "implementation/eFulfilment/xmi_conceptual_model/eFulfilment.xml"
       - "implementation/eContract/xmi_conceptual_model/eContract.xml"
-      - "implementation/eContract/xmi_conceptual_model/eAccess.xml"
-      - "implementation/eContract/xmi_conceptual_model/eSubmission.xml"
+      - "implementation/eAccess/xmi_conceptual_model/eAccess.xml"
+      - "implementation/eSubmission/xmi_conceptual_model/eSubmission.xml"
+      - "implementation/eInvoicing/xmi_conceptual_model/eInvoicing.xml"
 jobs:
   report_and_glossary:
     runs-on: ubuntu-latest
@@ -26,7 +28,7 @@ jobs:
 
       - name: get model2owl
         run: |
-          git clone --branch 2.2.0 https://github.com/OP-TED/model2owl.git
+          git clone --branch no-tags-2-2-0 https://github.com/OP-TED/model2owl.git
           pwd
 
       - name: get-saxon
@@ -35,7 +37,7 @@ jobs:
 
       - name: generate convention report and glossary
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
           do
             echo "-------------------${implementation}---------------------------------"
@@ -68,7 +70,7 @@ jobs:
 
       - name: merge implementations xmi files into one
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           cd model2owl
           mkdir -p merge-xmis
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
@@ -137,7 +139,7 @@ jobs:
 
       - name: get model2owl
         run: |
-          git clone --branch 2.2.0 https://github.com/OP-TED/model2owl.git
+          git clone --branch no-tags-2-2-0 https://github.com/OP-TED/model2owl.git
           pwd
 
       - name: get-saxon
@@ -148,7 +150,7 @@ jobs:
 
       - name: transform step
         run: |
-          AVAILABLE_IMPLEMENTATIONS=(eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
+          AVAILABLE_IMPLEMENTATIONS=(eInvoicing eOrdering eFulfilment eCatalogue eNotice eContract eAccess eSubmission ePO_core)
           for implementation in "${AVAILABLE_IMPLEMENTATIONS[@]}"
           do
             echo "-------------------${implementation} transform---------------------------------"
@@ -213,4 +215,4 @@ jobs:
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+          branch: ${{ github.ref }}
diff --git a/README.md b/README.md
@@ -84,6 +84,7 @@ The issues are classified based on for classification dimensions:
     * eOrdering
     * eCatalogue
     * eFulfillment
+	* eInvoicing
     * eAccess
     * eContract
     * eSubmission

diff --git a/analysis_and_design/conceptual_model/ePO_CM.eap b/analysis_and_design/conceptual_model/ePO_CM.eap
diff --git a/analysis_and_design/conceptual_model/ePO_CM.qea b/analysis_and_design/conceptual_model/ePO_CM.qea
diff --git a/glossary/eAccess_glossary.html b/glossary/eAccess_glossary.html
diff --git a/glossary/eCatalogue_glossary.html b/glossary/eCatalogue_glossary.html
diff --git a/glossary/eContract_glossary.html b/glossary/eContract_glossary.html
@@ -68,28 +68,13 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Attributes (datatype
                   <tr>
                      <td>epo-con:ContractModificationInformation</td>
                      <td>epo:hasModificationDescription</td>
-                     <td>An explanatory text about this context. 
-
-                        Additional Information
-
-                        This corresponds in Standard forms to Field VII.2.1 in F20
-                        This corresponds in eForms to BT-202 .
-
-                        WG Approval 5/11/2019
-                        </td>
+                     <td>An explanatory text about this context. </td>
                      <td>rdf:PlainLiteral [0..1]</td>
                   </tr>
                   <tr>
                      <td>epo-con:ContractModificationInformation</td>
                      <td>epo:hasModificationReasonDescription</td>
                      <td>An explanation about the reasons for using the concept. 
-
-                        Additional Information
-                        This corresponds in Standard forms to Field VII.2.2.2 and VII.2.2.4 in F20.
-
-                        This corresponds in eForms to BT-201 .
-
-                        WG Approval 5/11/2019
                         </td>
                      <td>rdf:PlainLiteral [0..1]</td>
                   </tr>
@@ -124,19 +109,8 @@ <h2 xmlns:f="http://https://github.com/costezki/model2owl#">Predicates (object p
                      <td>epo:hasModificationJustification</td>
                      <td>Explanation of why a contract was modified.
 
-                        WG Approval 09/11/2021
-
                         The codelist to be used is at-voc:modification-justification which is available at
-                        http://publications.europa.eu/resource/dataset/modification-justification
-
-                        Additional Information
-
-                        This corresponds in Standard forms to Field VII.2.2.1 and VII.2.2.3 in F20 .
-
-                        This corresponds in eForms to BT-200.
-
-
-                        </td>
+                        http://publications.europa.eu/resource/dataset/modification-justification</td>
                      <td>epo-con:ContractModificationInformation -&gt; at-voc:modification-justification (external) [1]</td>
                   </tr>
                   <tr>