Skip to content

Commit

Permalink
Merge pull request #59 from OP-TED/add-voluntary-forms
Browse files Browse the repository at this point in the history
Add voluntary forms to expected notice subtypes (TEDEFO-3556)
  • Loading branch information
bertrand-lorentz authored Jul 29, 2024
2 parents ce3b872 + 7eb7905 commit 9713066
Show file tree
Hide file tree
Showing 15 changed files with 686 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public Set<String> getExpectedNoticeSubtypes() {
"20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
"30", "31", "32", "33", "34", "35", "36", "37", "38", "39",
"40",
"CEI", "T01", "T02", "X01", "X02")
"CEI", "T01", "T02", "X01", "X02",
"E1", "E2", "E3", "E4", "E5", "E6")
.collect(Collectors.toSet());
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"ublVersion" : "2.3",
"sdkVersion" : "1.10.0",
"metadataDatabase" : {
"version" : "1.10.0",
"createdOn" : "2023-11-15T14:00:00"
},
"noticeId" : "E1",
"metadata" : [ {
"id" : "BT-02-notice",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Notice Type",
"_label" : "field|name|BT-02-notice",
"readOnly" : true
} ],
"content" : [ {
"id" : "GR-Buyer",
"contentType" : "group",
"displayType" : "SECTION",
"description" : "Contracting Party and Provider related Information",
"_label" : "group|name|GR-Buyer",
"content" : [ {
"id" : "GR-ContractingAuthority",
"contentType" : "group",
"nodeId" : "ND-ContractingParty",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|ND-ContractingParty",
"_repeatable" : true,
"content" : [ {
"id" : "GR-ContractingAuthority-Buyer",
"contentType" : "group",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|GR-ContractingAuthority-Buyer",
"content" : [ {
"id" : "OPT-300-Procedure-Buyer",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Buyer Technical Identifier Reference",
"_label" : "field|name|OPT-300-Procedure-Buyer",
"_idSchemes" : [ "ORG" ]
} ]
} ]
} ]
} ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"ublVersion" : "2.3",
"sdkVersion" : "1.10.0",
"metadataDatabase" : {
"version" : "1.10.0",
"createdOn" : "2023-11-15T14:00:00"
},
"noticeId" : "E2",
"metadata" : [ {
"id" : "BT-02-notice",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Notice Type",
"_label" : "field|name|BT-02-notice",
"readOnly" : true
} ],
"content" : [ {
"id" : "GR-Buyer",
"contentType" : "group",
"displayType" : "SECTION",
"description" : "Contracting Party and Provider related Information",
"_label" : "group|name|GR-Buyer",
"content" : [ {
"id" : "GR-ContractingAuthority",
"contentType" : "group",
"nodeId" : "ND-ContractingParty",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|ND-ContractingParty",
"_repeatable" : true,
"content" : [ {
"id" : "GR-ContractingAuthority-Buyer",
"contentType" : "group",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|GR-ContractingAuthority-Buyer",
"content" : [ {
"id" : "OPT-300-Procedure-Buyer",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Buyer Technical Identifier Reference",
"_label" : "field|name|OPT-300-Procedure-Buyer",
"_idSchemes" : [ "ORG" ]
} ]
} ]
} ]
} ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"ublVersion" : "2.3",
"sdkVersion" : "1.10.0",
"metadataDatabase" : {
"version" : "1.10.0",
"createdOn" : "2023-11-15T14:00:00"
},
"noticeId" : "E3",
"metadata" : [ {
"id" : "BT-02-notice",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Notice Type",
"_label" : "field|name|BT-02-notice",
"readOnly" : true
} ],
"content" : [ {
"id" : "GR-Buyer",
"contentType" : "group",
"displayType" : "SECTION",
"description" : "Contracting Party and Provider related Information",
"_label" : "group|name|GR-Buyer",
"content" : [ {
"id" : "GR-ContractingAuthority",
"contentType" : "group",
"nodeId" : "ND-ContractingParty",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|ND-ContractingParty",
"_repeatable" : true,
"content" : [ {
"id" : "GR-ContractingAuthority-Buyer",
"contentType" : "group",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|GR-ContractingAuthority-Buyer",
"content" : [ {
"id" : "OPT-300-Procedure-Buyer",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Buyer Technical Identifier Reference",
"_label" : "field|name|OPT-300-Procedure-Buyer",
"_idSchemes" : [ "ORG" ]
} ]
} ]
} ]
} ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"ublVersion" : "2.3",
"sdkVersion" : "1.10.0",
"metadataDatabase" : {
"version" : "1.10.0",
"createdOn" : "2023-11-15T14:00:00"
},
"noticeId" : "E4",
"metadata" : [ {
"id" : "BT-02-notice",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Notice Type",
"_label" : "field|name|BT-02-notice",
"readOnly" : true
} ],
"content" : [ {
"id" : "GR-Buyer",
"contentType" : "group",
"displayType" : "SECTION",
"description" : "Contracting Party and Provider related Information",
"_label" : "group|name|GR-Buyer",
"content" : [ {
"id" : "GR-ContractingAuthority",
"contentType" : "group",
"nodeId" : "ND-ContractingParty",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|ND-ContractingParty",
"_repeatable" : true,
"content" : [ {
"id" : "GR-ContractingAuthority-Buyer",
"contentType" : "group",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|GR-ContractingAuthority-Buyer",
"content" : [ {
"id" : "OPT-300-Procedure-Buyer",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Buyer Technical Identifier Reference",
"_label" : "field|name|OPT-300-Procedure-Buyer",
"_idSchemes" : [ "ORG" ]
} ]
} ]
} ]
} ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"ublVersion" : "2.3",
"sdkVersion" : "1.10.0",
"metadataDatabase" : {
"version" : "1.10.0",
"createdOn" : "2023-11-15T14:00:00"
},
"noticeId" : "E5",
"metadata" : [ {
"id" : "BT-02-notice",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Notice Type",
"_label" : "field|name|BT-02-notice",
"readOnly" : true
} ],
"content" : [ {
"id" : "GR-Buyer",
"contentType" : "group",
"displayType" : "SECTION",
"description" : "Contracting Party and Provider related Information",
"_label" : "group|name|GR-Buyer",
"content" : [ {
"id" : "GR-ContractingAuthority",
"contentType" : "group",
"nodeId" : "ND-ContractingParty",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|ND-ContractingParty",
"_repeatable" : true,
"content" : [ {
"id" : "GR-ContractingAuthority-Buyer",
"contentType" : "group",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|GR-ContractingAuthority-Buyer",
"content" : [ {
"id" : "OPT-300-Procedure-Buyer",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Buyer Technical Identifier Reference",
"_label" : "field|name|OPT-300-Procedure-Buyer",
"_idSchemes" : [ "ORG" ]
} ]
} ]
} ]
} ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"ublVersion" : "2.3",
"sdkVersion" : "1.10.0",
"metadataDatabase" : {
"version" : "1.10.0",
"createdOn" : "2023-11-15T14:00:00"
},
"noticeId" : "E6",
"metadata" : [ {
"id" : "BT-02-notice",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Notice Type",
"_label" : "field|name|BT-02-notice",
"readOnly" : true
} ],
"content" : [ {
"id" : "GR-Buyer",
"contentType" : "group",
"displayType" : "SECTION",
"description" : "Contracting Party and Provider related Information",
"_label" : "group|name|GR-Buyer",
"content" : [ {
"id" : "GR-ContractingAuthority",
"contentType" : "group",
"nodeId" : "ND-ContractingParty",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|ND-ContractingParty",
"_repeatable" : true,
"content" : [ {
"id" : "GR-ContractingAuthority-Buyer",
"contentType" : "group",
"displayType" : "GROUP",
"description" : "Contracting Party related Information (URL, Legal Type, Contracting Type, Activity, …)",
"_label" : "group|name|GR-ContractingAuthority-Buyer",
"content" : [ {
"id" : "OPT-300-Procedure-Buyer",
"contentType" : "field",
"displayType" : "COMBOBOX",
"description" : "Buyer Technical Identifier Reference",
"_label" : "field|name|OPT-300-Procedure-Buyer",
"_idSchemes" : [ "ORG" ]
} ]
} ]
} ]
} ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,60 @@
"subTypeId" : "X02",
"_label" : "notice|name|X02",
"viewTemplateIds" : [ "summary", "X02" ]
}, {
"documentType" : "PIN",
"legalBasis" : "other",
"formType" : "planning",
"type" : "pin-only",
"description" : "Voluntary Pre-market Consultation Notice",
"subTypeId" : "E1",
"_label" : "notice|name|E1",
"viewTemplateIds" : [ "summary", "E1" ]
}, {
"documentType" : "PIN",
"legalBasis" : "other",
"formType" : "planning",
"type" : "pin-only",
"description" : "Voluntary Prior Information Notice",
"subTypeId" : "E2",
"_label" : "notice|name|E2",
"viewTemplateIds" : [ "summary", "E2" ]
}, {
"documentType" : "CN",
"legalBasis" : "other",
"formType" : "competition",
"type" : "cn-standard",
"description" : "Voluntary Contract Notice",
"subTypeId" : "E3",
"_label" : "notice|name|E3",
"viewTemplateIds" : [ "summary", "E3" ]
}, {
"documentType" : "CAN",
"legalBasis" : "other",
"formType" : "result",
"type" : "can-standard",
"description" : "Voluntary Award Notice",
"subTypeId" : "E4",
"_label" : "notice|name|E4",
"viewTemplateIds" : [ "summary", "E4" ]
}, {
"documentType" : "CAN",
"legalBasis" : "other",
"formType" : "completion",
"type" : "",
"description" : "Voluntary Completion Notice",
"subTypeId" : "E5",
"_label" : "notice|name|E5",
"viewTemplateIds" : [ "summary", "E5" ]
}, {
"documentType" : "CAN",
"legalBasis" : "other",
"formType" : "cont-modif",
"type" : "can-modif",
"description" : "Voluntary Contract Modification Notice",
"subTypeId" : "E6",
"_label" : "notice|name|E6",
"viewTemplateIds" : [ "summary", "E6" ]
} ],
"documentTypes" : [ {
"id" : "BRIN",
Expand Down
Loading

0 comments on commit 9713066

Please sign in to comment.