Skip to content

Commit

Permalink
Merge pull request #52 from Ed-Fi-Alliance-OSS/DATASTD-1631
Browse files Browse the repository at this point in the history 
[DATASTD-1631] add Term descriptor to CohortYear common object supporting artifacts
  • Loading branch information
@ejansson
ejansson authored Sep 20, 2021
2 parents f221a91 + 0f57438 commit 443c377
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 32 deletions.
14 changes: 14 additions & 0 deletions Samples/Sample XML/StudentEnrollment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527068,6 +527068,11 @@
<HispanicLatinoEthnicity>false</HispanicLatinoEthnicity>
<OldEthnicity>uri://ed-fi.org/OldEthnicityDescriptor#White, Not Of Hispanic Origin</OldEthnicity>
<Race>uri://ed-fi.org/RaceDescriptor#White</Race>
<CohortYear>
<SchoolYear>2021-2022</SchoolYear>
<CohortYearType>uri://ed-fi.org/CohortYearTypeDescriptor#Twelfth grade</CohortYearType>
<Term>uri://ed-fi.org/TermDescriptor#Spring Semester</Term>
</CohortYear>
<StudentIndicator>
<IndicatorGroup>Digital Equity</IndicatorGroup>
<IndicatorName>Primary Learning Device Away From School</IndicatorName>
Expand Down Expand Up @@ -531007,6 +531012,11 @@
<Language>uri://ed-fi.org/LanguageDescriptor#por</Language>
<LanguageUse>uri://ed-fi.org/LanguageUseDescriptor#Home language</LanguageUse>
</Language>
<CohortYear>
<SchoolYear>2021-2022</SchoolYear>
<CohortYearType>uri://ed-fi.org/CohortYearTypeDescriptor#Twelfth grade</CohortYearType>
<Term>uri://ed-fi.org/TermDescriptor#Fall Semester</Term>
</CohortYear>
<StudentIndicator>
<IndicatorGroup>Digital Equity</IndicatorGroup>
<IndicatorName>Primary Learning Device Away From School</IndicatorName>
Expand Down Expand Up @@ -542437,6 +542447,10 @@
<HispanicLatinoEthnicity>true</HispanicLatinoEthnicity>
<OldEthnicity>uri://ed-fi.org/OldEthnicityDescriptor#White, Not Of Hispanic Origin</OldEthnicity>
<Race>uri://ed-fi.org/RaceDescriptor#American Indian - Alaska Native</Race>
<CohortYear>
<SchoolYear>2021-2022</SchoolYear>
<CohortYearType>uri://ed-fi.org/CohortYearTypeDescriptor#Twelfth grade</CohortYearType>
</CohortYear>
<StudentIndicator>
<IndicatorGroup>Digital Equity</IndicatorGroup>
<IndicatorName>Primary Learning Device Away From School</IndicatorName>
Expand Down
10 changes: 9 additions & 1 deletion Schemas/Bulk/Ed-Fi-Core.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16550,7 +16550,7 @@
<xs:sequence>
<xs:element name="SchoolYear" type="SchoolYearType">
<xs:annotation>
<xs:documentation>The value of the school year for the Cohort.</xs:documentation>
<xs:documentation>The school year associated with the cohort; for example, the intended school year of graduation.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CohortYearType" type="CohortYearTypeDescriptorReferenceType">
Expand All @@ -16561,6 +16561,14 @@
</xs:appinfo>
</xs:annotation>
</xs:element>
<xs:element name="Term" type="TermDescriptorReferenceType" minOccurs="0">
<xs:annotation>
<xs:documentation>The term associated with the cohort year; for example, the intended term of graduation.</xs:documentation>
<xs:appinfo>
<ann:Descriptor>TermDescriptor</ann:Descriptor>
</xs:appinfo>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ContentStandard">
Expand Down
32 changes: 16 additions & 16 deletions Schemas/Bulk/Interchange-Parent.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ed-fi.org/3.3.1-b" targetNamespace="http://ed-fi.org/3.3.1-b" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:include schemaLocation="Ed-Fi-Core.xsd"/>
<xs:annotation>
<xs:documentation>===== Parent Interchange Model =====</xs:documentation>
</xs:annotation>
<xs:element name="InterchangeParent">
<xs:annotation>
<xs:documentation>This interchange defines parents and captures the familial relationship between the student and the parent as well as indicators for the parent for residence, primary parental contact, and emergency contact.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:element name="Parent" type="Parent"/>
<xs:element name="StudentParentAssociation" type="StudentParentAssociation"/>
<xs:element name="Person" type="Person"/>
</xs:choice>
</xs:complexType>
</xs:element>
<xs:include schemaLocation="Ed-Fi-Core.xsd" />
<xs:annotation>
<xs:documentation>===== Parent Interchange Model =====</xs:documentation>
</xs:annotation>
<xs:element name="InterchangeParent">
<xs:annotation>
<xs:documentation>This interchange defines parents and captures the familial relationship between the student and the parent as well as indicators for the parent for residence, primary parental contact, and emergency contact.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:element name="Parent" type="Parent" />
<xs:element name="StudentParentAssociation" type="StudentParentAssociation" />
<xs:element name="Person" type="Person" />
</xs:choice>
</xs:complexType>
</xs:element>
</xs:schema>
30 changes: 15 additions & 15 deletions Schemas/Bulk/Interchange-Student.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ed-fi.org/3.3.1-b" targetNamespace="http://ed-fi.org/3.3.1-b" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:include schemaLocation="Ed-Fi-Core.xsd"/>
<xs:annotation>
<xs:documentation>===== Student Interchange Model =====</xs:documentation>
</xs:annotation>
<xs:element name="InterchangeStudent">
<xs:annotation>
<xs:documentation>This interchange defines students and contains all their identifying information.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:element name="Student" type="Student"/>
<xs:element name="Person" type="Person"/>
</xs:choice>
</xs:complexType>
</xs:element>
<xs:include schemaLocation="Ed-Fi-Core.xsd" />
<xs:annotation>
<xs:documentation>===== Student Interchange Model =====</xs:documentation>
</xs:annotation>
<xs:element name="InterchangeStudent">
<xs:annotation>
<xs:documentation>This interchange defines students and contains all their identifying information.</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:element name="Student" type="Student" />
<xs:element name="Person" type="Person" />
</xs:choice>
</xs:complexType>
</xs:element>
</xs:schema>

0 comments on commit 443c377

Please sign in to comment.