Skip to content

Commit 3938ead

Browse files
lexjansenlexjansen
authored
Merge pull request #55 from cdisc-org/wiki_updates
bringing up to date with documentation
2 parents 582c8db + bb71fb2 commit 3938ead

6 files changed

+24
-76
lines changed

‎schema/ODM-admindata.xsd

+6-2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@
5353
<xs:attribute name="MetaDataVersionOID" type="oidref" use="required"/>
5454
<xs:attribute name="EffectiveDate" type="date" use="required"/>
5555
</xs:attributeGroup>
56+
<xs:attributeGroup name="TelecomAttributeDefinition">
57+
<xs:attribute name="TelecomType" type="TelecomTypeType" use="required"/>
58+
<xs:attribute name="Value" type="text" use="required"/>
59+
</xs:attributeGroup>
5660

5761
<!--
5862
+===========================================================================+
@@ -175,8 +179,8 @@
175179
<xs:sequence>
176180
<xs:group ref="TelecomElementExtension" minOccurs="0" maxOccurs="unbounded"/>
177181
</xs:sequence>
178-
<xs:attribute name="TelecomType" type="TelecomTypeType" use="required"/>
179-
<xs:attribute name="Value" type="text" use="required"/>
182+
<xs:attributeGroup ref="TelecomAttributeDefinition"/>
183+
<xs:attributeGroup ref="TelecomAttributeExtension"/>
180184
</xs:complexType>
181185
<xs:complexType name="ODMcomplexTypeDefinition-StreetName">
182186
<xs:simpleContent>

‎schema/ODM-enumerations.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ <h2>Enumerations</h2>
246246
<li><a href="#attribute-def:StudyObjectiveLevel">StudyObjectiveLevel</a></li>
247247
<li><a href="#attribute-def:TrialPhaseType">TrialPhaseType</a></li>
248248
<li><a href="#attribute-def:StudyEndPointType">StudyEndPointType</a></li>
249-
<li><a href="#attribute-def:StudyEndPointLevel">StudyEndPointLevel</a></li>
249+
<li><a href="#attribute-def:StudyEstimandLevel">StudyEstimandLevel</a></li>
250250
<li><a href="#attribute-def:RelativeTimingConstraintType">RelativeTimingConstraintType</a></li>
251251
<li><a href="#attribute-def:Comparator">Comparator</a></li>
252252
<li><a href="#attribute-def:SoftOrHard">SoftOrHard</a></li>
@@ -374,7 +374,7 @@ <h3>Schema version: 2.0</h3>
374374
<td class="values"><span class="code">'Simple'</span><br><span class="code">'Humane'</span><br><span class="code">'Surrogate'</span><br><span class="code">'Composite'</span></td>
375375
</tr>
376376
<tr class="tableroweven">
377-
<td class="name"><a id="attribute-def:StudyEndPointLevel"></a><a id="type-def:StudyEndPointLevel">StudyEndPointLevel</a></td>
377+
<td class="name"><a id="attribute-def:StudyEstimandLevel"></a><a id="type-def:StudyEstimandLevel">StudyEstimandLevel</a></td>
378378
<td class="description"></td>
379379
<td class="type">Enumeration</td>
380380
<td class="extensible">No</td>

‎schema/ODM-enumerations.xsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
</xs:restriction>
234234
</xs:simpleType>
235235

236-
<xs:simpleType name="StudyEndPointLevel">
236+
<xs:simpleType name="StudyEstimandLevel">
237237
<xs:restriction base="xs:string">
238238
<xs:enumeration value="Primary"/>
239239
<xs:enumeration value="Secondary"/>

‎schema/ODM-foundation.xsd

+3-34
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<xs:attributeGroup name="GivenNameAttributeExtension"/>
100100
<xs:attributeGroup name="FamilyNameAttributeExtension"/>
101101
<xs:attributeGroup name="ImageAttributeExtension"/>
102+
<xs:attributeGroup name="TelecomAttributeExtension"/>
102103
<xs:attributeGroup name="OrganizationAttributeExtension"/>
103104
<xs:attributeGroup name="StreetNameAttributeExtension"/>
104105
<xs:attributeGroup name="HouseNumberAttributeExtension"/>
@@ -128,6 +129,7 @@
128129
<xs:attributeGroup name="MetaDataVersionAttributeExtension"/>
129130
<xs:attributeGroup name="DocumentRefAttributeExtension"/>
130131
<xs:attributeGroup name="LeafAttributeExtension"/>
132+
<xs:attributeGroup name="TitleAttributeExtension"/>
131133
<xs:attributeGroup name="PDFPageRefAttributeExtension"/>
132134
<xs:attributeGroup name="StandardAttributeExtension"/>
133135
<xs:attributeGroup name="AnnotatedCRFAttributeExtension"/>
@@ -142,11 +144,7 @@
142144
<xs:attributeGroup name="DefaultTransitionAttributeExtension"/>
143145
<xs:attributeGroup name="BranchingAttributeExtension"/>
144146
<xs:attributeGroup name="WorkflowEndAttributeExtension"/>
145-
<xs:attributeGroup name="EntryExitCriteriaAttributeExtension"/>
146-
<xs:attributeGroup name="EntryCriteriaAttributeExtension"/>
147147
<xs:attributeGroup name="CriterionAttributeExtension"/>
148-
<xs:attributeGroup name="ExitCriteriaAttributeExtension"/>
149-
<xs:attributeGroup name="ExceptionEventAttributeExtension"/>
150148
<xs:attributeGroup name="WorkflowRefAttributeExtension"/>
151149
<xs:attributeGroup name="StudyEventGroupRefAttributeExtension"/>
152150
<xs:attributeGroup name="StudyEventGroupDefAttributeExtension"/>
@@ -248,9 +246,6 @@
248246
<xs:group name="OriginElementExtension">
249247
<xs:sequence/>
250248
</xs:group>
251-
<xs:group name="SourceItemsElementExtension">
252-
<xs:sequence/>
253-
</xs:group>
254249
<xs:group name="SourceItemElementExtension">
255250
<xs:sequence/>
256251
</xs:group>
@@ -344,18 +339,10 @@
344339
<xs:group name="DefaultTransitionElementExtension">
345340
<xs:sequence/>
346341
</xs:group>
347-
<xs:group name="EntryCriteriaElementExtension">
348-
<xs:sequence/>
349-
</xs:group>
342+
350343
<xs:group name="CriterionElementExtension">
351344
<xs:sequence/>
352345
</xs:group>
353-
<xs:group name="ExitCriteriaElementExtension">
354-
<xs:sequence/>
355-
</xs:group>
356-
<xs:group name="ExceptionEventElementExtension">
357-
<xs:sequence/>
358-
</xs:group>
359346
<xs:group name="WorkflowRefElementExtension">
360347
<xs:sequence/>
361348
</xs:group>
@@ -371,39 +358,24 @@
371358
<xs:group name="TrialPhaseElementExtension">
372359
<xs:sequence/>
373360
</xs:group>
374-
<xs:group name="StudyIndicationsElementExtension">
375-
<xs:sequence/>
376-
</xs:group>
377361
<xs:group name="StudyIndicationElementExtension">
378362
<xs:sequence/>
379363
</xs:group>
380-
<xs:group name="StudyInterventionsElementExtension">
381-
<xs:sequence/>
382-
</xs:group>
383364
<xs:group name="StudyInterventionElementExtension">
384365
<xs:sequence/>
385366
</xs:group>
386-
<xs:group name="StudyObjectivesElementExtension">
387-
<xs:sequence/>
388-
</xs:group>
389367
<xs:group name="StudyObjectiveElementExtension">
390368
<xs:sequence/>
391369
</xs:group>
392370
<xs:group name="StudyEndPointRefElementExtension">
393371
<xs:sequence/>
394372
</xs:group>
395-
<xs:group name="StudyEndPointsElementExtension">
396-
<xs:sequence/>
397-
</xs:group>
398373
<xs:group name="StudyEndPointElementExtension">
399374
<xs:sequence/>
400375
</xs:group>
401376
<xs:group name="StudyTargetPopulationElementExtension">
402377
<xs:sequence/>
403378
</xs:group>
404-
<xs:group name="StudyEstimandsElementExtension">
405-
<xs:sequence/>
406-
</xs:group>
407379
<xs:group name="StudyEstimandElementExtension">
408380
<xs:sequence/>
409381
</xs:group>
@@ -437,9 +409,6 @@
437409
<xs:group name="ParameterValueElementExtension">
438410
<xs:sequence/>
439411
</xs:group>
440-
<xs:group name="StudyTimingsElementExtension">
441-
<xs:sequence/>
442-
</xs:group>
443412
<xs:group name="StudyTimingElementExtension">
444413
<xs:sequence/>
445414
</xs:group>

‎schema/ODM-protocol.xsd

+3-34
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<xs:attributeGroup name="StudyObjectiveAttributeDefinition">
2525
<xs:attribute name="OID" type="oid" use="required"/>
2626
<xs:attribute name="Name" type="name" use="required"/>
27-
<xs:attribute name="Type" type="StudyObjectiveLevel" use="optional"/>
27+
<xs:attribute name="Level" type="StudyObjectiveLevel" use="optional"/>
2828
</xs:attributeGroup>
2929
<xs:attributeGroup name="StudyEndPointRefAttributeDefinition">
3030
<xs:attribute name="StudyEndPointOID" type="oidref" use="required"/>
@@ -34,7 +34,7 @@
3434
<xs:attribute name="OID" type="oid" use="required"/>
3535
<xs:attribute name="Name" type="name" use="required"/>
3636
<xs:attribute name="Type" type="StudyEndPointType" use="optional"/>
37-
<xs:attribute name="Level" type="StudyEndPointLevel" use="optional"/>
37+
<xs:attribute name="Level" type="StudyEstimandLevel" use="optional"/>
3838
</xs:attributeGroup>
3939
<xs:attributeGroup name="StudyTargetPopulationAttributeDefinition">
4040
<xs:attribute name="OID" type="oid" use="required"/>
@@ -43,6 +43,7 @@
4343
<xs:attributeGroup name="StudyEstimandAttributeDefinition">
4444
<xs:attribute name="OID" type="oid" use="required"/>
4545
<xs:attribute name="Name" type="name" use="required"/>
46+
<xs:attribute name="Level" type="StudyEstimandLevel" use="optional"/>
4647
</xs:attributeGroup>
4748
<xs:attributeGroup name="StudyTargetPopulationRefAttributeDefinition">
4849
<xs:attribute name="StudyTargetPopulationOID" type="oidref" use="required"/>
@@ -230,7 +231,6 @@
230231
<xs:complexType name="ODMcomplexTypeDefinition-StudyIndications">
231232
<xs:sequence>
232233
<xs:element ref="StudyIndication" minOccurs="1" maxOccurs="unbounded"/>
233-
<xs:group ref="StudyIndicationsElementExtension" minOccurs="0" maxOccurs="unbounded"/>
234234
</xs:sequence>
235235
<xs:attributeGroup ref="StudyIndicationsAttributeExtension"/>
236236
</xs:complexType>
@@ -246,7 +246,6 @@
246246
<xs:complexType name="ODMcomplexTypeDefinition-StudyInterventions">
247247
<xs:sequence>
248248
<xs:element ref="StudyIntervention" minOccurs="1" maxOccurs="unbounded"/>
249-
<xs:group ref="StudyInterventionsElementExtension" minOccurs="0" maxOccurs="unbounded"/>
250249
</xs:sequence>
251250
<xs:attributeGroup ref="StudyInterventionsAttributeExtension"/>
252251
</xs:complexType>
@@ -262,7 +261,6 @@
262261
<xs:complexType name="ODMcomplexTypeDefinition-StudyObjectives">
263262
<xs:sequence>
264263
<xs:element ref="StudyObjective" minOccurs="1" maxOccurs="unbounded"/>
265-
<xs:group ref="StudyObjectivesElementExtension" minOccurs="0" maxOccurs="unbounded"/>
266264
</xs:sequence>
267265
<xs:attributeGroup ref="StudyObjectivesAttributeExtension"/>
268266
</xs:complexType>
@@ -286,7 +284,6 @@
286284
<xs:complexType name="ODMcomplexTypeDefinition-StudyEndPoints">
287285
<xs:sequence>
288286
<xs:element ref="StudyEndPoint" minOccurs="1" maxOccurs="unbounded"/>
289-
<xs:group ref="StudyEndPointsElementExtension" minOccurs="0" maxOccurs="unbounded"/>
290287
</xs:sequence>
291288
<xs:attributeGroup ref="StudyEndPointsAttributeExtension"/>
292289
</xs:complexType>
@@ -312,7 +309,6 @@
312309
<xs:complexType name="ODMcomplexTypeDefinition-StudyEstimands">
313310
<xs:sequence>
314311
<xs:element ref="StudyEstimand" minOccurs="1" maxOccurs="unbounded"/>
315-
<xs:group ref="StudyEstimandsElementExtension" minOccurs="0" maxOccurs="unbounded"/>
316312
</xs:sequence>
317313
<xs:attributeGroup ref="StudyEstimandsAttributeExtension"/>
318314
</xs:complexType>
@@ -431,7 +427,6 @@
431427
<xs:complexType name="ODMcomplexTypeDefinition-StudyTimings">
432428
<xs:sequence>
433429
<xs:element ref="StudyTiming" maxOccurs="unbounded"/>
434-
<xs:group ref="StudyTimingsElementExtension"/>
435430
</xs:sequence>
436431
<xs:attributeGroup ref="StudyTimingsAttributeExtension"/>
437432
</xs:complexType>
@@ -537,29 +532,6 @@
537532
</xs:extension>
538533
</xs:simpleContent>
539534
</xs:complexType>
540-
<xs:complexType name="ODMcomplexTypeDefinition-EntryCriteria">
541-
<xs:sequence>
542-
<xs:element ref="Criterion" minOccurs="0" maxOccurs="unbounded"/>
543-
<xs:group ref="EntryCriteriaElementExtension" minOccurs="0" maxOccurs="unbounded"/>
544-
</xs:sequence>
545-
<xs:attributeGroup ref="EntryCriteriaAttributeExtension"/>
546-
</xs:complexType>
547-
<xs:complexType name="ODMcomplexTypeDefinition-ExitCriteria">
548-
<xs:sequence>
549-
<xs:element ref="Criterion" minOccurs="0" maxOccurs="unbounded"/>
550-
<xs:group ref="ExitCriteriaElementExtension" minOccurs="0" maxOccurs="unbounded"/>
551-
</xs:sequence>
552-
<xs:attributeGroup ref="ExitCriteriaAttributeExtension"/>
553-
</xs:complexType>
554-
<xs:complexType name="ODMcomplexTypeDefinition-ExceptionEvent">
555-
<xs:sequence>
556-
<xs:element ref="Description" minOccurs="0" maxOccurs="1"/>
557-
<xs:group ref="ExceptionEventGroupDefinition" minOccurs="1" maxOccurs="1"/>
558-
<xs:group ref="ExceptionEventElementExtension" minOccurs="0" maxOccurs="1"/>
559-
</xs:sequence>
560-
<xs:attributeGroup ref="ExceptionEventAttributeDefinition"/>
561-
<xs:attributeGroup ref="ExceptionEventAttributeExtension"/>
562-
</xs:complexType>
563535

564536
<!--
565537
+===========================================================================+
@@ -613,8 +585,5 @@
613585
<xs:element name="DefaultTransition" type="ODMcomplexTypeDefinition-DefaultTransition"/>
614586
<xs:element name="WorkflowEnd" type="ODMcomplexTypeDefinition-WorkflowEnd"/>
615587
<xs:element name="Criterion" type="ODMcomplexTypeDefinition-Criterion"/>
616-
<xs:element name="EntryCriteria" type="ODMcomplexTypeDefinition-EntryCriteria"/>
617-
<xs:element name="ExitCriteria" type="ODMcomplexTypeDefinition-ExitCriteria"/>
618-
<xs:element name="ExceptionEvent" type="ODMcomplexTypeDefinition-ExceptionEvent"/>
619588

620589
</xs:schema>

‎schema/ODM-study.xsd

+9-3
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,21 @@
424424
<xs:complexType name="ODMcomplexTypeDefinition-Leaf">
425425
<xs:annotation><xs:documentation>Contains the XLink information referenced by DocumentRef or ArchiveLocationID</xs:documentation></xs:annotation>
426426
<xs:sequence>
427-
<xs:element name="Title" minOccurs="1" maxOccurs="1">
427+
<xs:element ref="Title" minOccurs="1" maxOccurs="1">
428428
<xs:annotation><xs:documentation>Text with the label for the document or dataset.</xs:documentation></xs:annotation>
429429
</xs:element>
430430
<xs:group ref="LeafElementExtension" minOccurs="0" maxOccurs="1"/>
431431
</xs:sequence>
432432
<xs:attributeGroup ref="LeafAttributeDefinition"/>
433433
<xs:attributeGroup ref="LeafAttributeExtension"/>
434434
</xs:complexType>
435-
435+
<xs:complexType name="ODMcomplexTypeDefinition-Title">
436+
<xs:simpleContent>
437+
<xs:extension base="text">
438+
<xs:attributeGroup ref="TitleAttributeExtension"/>
439+
</xs:extension>
440+
</xs:simpleContent>
441+
</xs:complexType>
436442
<xs:complexType name="ODMcomplexTypeDefinition-Include">
437443
<xs:sequence>
438444
<xs:group ref="IncludeElementExtension" minOccurs="0" maxOccurs="unbounded"/>
@@ -612,7 +618,6 @@
612618
<xs:sequence>
613619
<xs:element ref="SourceItem" minOccurs="1" maxOccurs="unbounded"/>
614620
<xs:element ref="Coding" minOccurs="0" maxOccurs="unbounded"/>
615-
<xs:group ref="SourceItemsElementExtension" minOccurs="0" maxOccurs="unbounded"/>
616621
</xs:sequence>
617622
<xs:attributeGroup ref="SourceItemsAttributeDefinition"/>
618623
<xs:attributeGroup ref="SourceItemsAttributeExtension"/>
@@ -920,6 +925,7 @@
920925
<xs:element name="DocumentRef" type="ODMcomplexTypeDefinition-DocumentRef" />
921926
<xs:element name="PDFPageRef" type="ODMcomplexTypeDefinition-PDFPageRef" />
922927
<xs:element name="Leaf" type="ODMcomplexTypeDefinition-Leaf"/>
928+
<xs:element name="Title" type="ODMcomplexTypeDefinition-Title"/>
923929
<xs:element name="Include" type="ODMcomplexTypeDefinition-Include"/>
924930
<xs:element name="Standards" type="ODMcomplexTypeDefinition-Standards">
925931
<xs:unique name="UC-STD-1">

0 commit comments

Comments
 (0)