Skip to content

Commit

Permalink
Bringing v5.0 changes into main (#221)
Browse files Browse the repository at this point in the history
* [DATASTD-2074] - Sample Data for GradingPeriodName (#204)

* [DATASTD-2074] - Sample Data for GradingPeriodName

* [DATASTD-2074] Removed PeriodSequence

---------

Co-authored-by: mmarable-dlp <[email protected]>

* [DATASTD-2092] Add AnnualWage sample data (#205)

* [DATASTD-2096] Sample data for section model (#206)

[DATASTD-2096] sample data for section model

* [DATASTD-2069] - Added SupporterMilitaryConnection Descriptor Values (#207)

* [DATASTD-2069] - Added SupporterMilitaryConnection Descriptor Values

* [DATASTD-2069] - Updated xsd files

* Revert "[DATASTD-2069] - Updated xsd files"

This reverts commit d2113fb.

* [DATASTD-2069] - Updated xsd files

* Revert "[DATASTD-2069] - Updated xsd files"

This reverts commit 0b20be4.

* [DASTD-2069] - Updated xsd files

* [DATASTD-2069] Update Ed-Fi-Core.xsd

---------

Co-authored-by: mmarable-dlp <[email protected]>
Co-authored-by: Mustafa Yilmaz <[email protected]>

* [DATASTD-2103] - Added sample data for SupporterMilitaryConnection element (#208)

* [ODS-6044] Integrate latest 5.0 Data Standard Work - Set 1 (#209)

* [ODS-5951] Trigger EdFi.Ods.DB.Templates workflow in ODS repository Removed (#203)

* Integrate latest 5.0 Data Standard Work - Set 1

* [DATASTD-2107] Update MasterSchedule.xml (#210)

Fix SectionType

* [DATASTD-2108] Fix EdOrgId under Program (#212)

* [DATASTD-2108] Add programs for EdOrgId 255901001 (#213)

* [DATASTD-2108] Fix EdOrgId under Program

* [DATASTD-2108] Add Program for edOrg 255901001

* [DATASTD-2105] -  Added Descriptor Values (#214)

* [DATASTD-2105] -  Added Descriptor Values

* [DATASTD-2105] - Fixed typo

* [DATASTD-2105]

* [DATASTD-2105] - Changed file name

* [DATASTD-2105] Updated XSD

---------

Co-authored-by: mmarable-dlp <[email protected]>

* [DATASTD-2019] - Sample data updates for Level rename (#211)

* [DATASTD-2019] - Sample data updates for Level rename

* [DATASTD-2019] - Added xsd file

* [DATASTD-2019]

* [DATASTD-2019]

* [DATASTD-2019]

---------

Co-authored-by: Muriel Marable <[email protected]>
Co-authored-by: Mustafa Yilmaz <[email protected]>

* [DATASTD-2110] - Sample Data Updates (#215)

* [DATASTD-2110] - Sample Data Updates

* [DATASTD-2110]

* [DATASTD-2108] - updated xsd (#216)

* [DATASTD-2108] - updated xsd

* [DATASTD-2108] - Modified sample data

* [DATASTD-2108]

---------

Co-authored-by: Steven Arnold <[email protected]>

* [DATASTD-2077] - Updated diagram (#217)

* [DATASTD-2077] - Updated diagram

* [DATASTD-2077]

* [DATASTD-2077]

* [DATASTD-2077]

* [DATASTD-2077]  - made more changes to the diagram

* [DATASTD-2077] - Fixed relationship

* Fix broken links in Readme (#218)

* Update README.md

* Update README.md

* [DATASTD-2118] - Fixed StudProgEval Tab (#220)

---------

Co-authored-by: Ernest Appiah <[email protected]>
Co-authored-by: mmarable-dlp <[email protected]>
Co-authored-by: Muriel Marable <[email protected]>
Co-authored-by: Mustafa Yilmaz <[email protected]>
Co-authored-by: semalaiappan <[email protected]>
Co-authored-by: Stephen Fuqua <[email protected]>
  • Loading branch information
7 people authored Dec 4, 2023
1 parent 957220a commit 17ee06d
Show file tree
Hide file tree
Showing 23 changed files with 55,351 additions and 42,039 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

Schemas/Bulk/SchemaAnnotation.xsd
21 changes: 21 additions & 0 deletions Descriptors/SectionTypeDescriptor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<InterchangeDescriptors xmlns="http://ed-fi.org/5.0.0" xmlns:ann="http://ed-fi.org/annotation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ed-fi.org/5.0.0 ../Schemas/Bulk/Interchange-Descriptors.xsd">
<SectionTypeDescriptor>
<CodeValue>Attendance and Credit</CodeValue>
<ShortDescription>Attendance and Credit</ShortDescription>
<Description>Attendance and Credit</Description>
<Namespace>uri://ed-fi.org/SectionTypeDescriptor</Namespace>
</SectionTypeDescriptor>
<SectionTypeDescriptor>
<CodeValue>Attendance Only</CodeValue>
<ShortDescription>Attendance Only</ShortDescription>
<Description>Attendance Only</Description>
<Namespace>uri://ed-fi.org/SectionTypeDescriptor</Namespace>
</SectionTypeDescriptor>
<SectionTypeDescriptor>
<CodeValue>Credit Only</CodeValue>
<ShortDescription>Credit Only</ShortDescription>
<Description>Credit Only</Description>
<Namespace>uri://ed-fi.org/SectionTypeDescriptor</Namespace>
</SectionTypeDescriptor>
</InterchangeDescriptors>
45 changes: 45 additions & 0 deletions Descriptors/SpecialEducationExitReasonDescriptor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<InterchangeDescriptors xmlns="http://ed-fi.org/5.0.0" xmlns:ann="http://ed-fi.org/annotation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ed-fi.org/5.0.0 ../Schemas/Bulk/Interchange-Descriptors.xsd">
<SpecialEducationExitReasonDescriptor>
<CodeValue>Transferred out</CodeValue>
<ShortDescription>Transferred to another educational organization</ShortDescription>
<Description>Student exited the Special Education program and related services because of transfering out another educational organization</Description>
<Namespace>uri://ed-fi.org/SpecialEducationExitReasonDescriptor</Namespace>
</SpecialEducationExitReasonDescriptor>
<SpecialEducationExitReasonDescriptor>
<CodeValue>Graduated with Diploma</CodeValue>
<ShortDescription>Graduated with Diploma</ShortDescription>
<Description>Student exited the Special Education program and related services because of graduating with a diploma.</Description>
<Namespace>uri://ed-fi.org/SpecialEducationExitReasonDescriptor</Namespace>
</SpecialEducationExitReasonDescriptor>
<SpecialEducationExitReasonDescriptor>
<CodeValue>Graduated with Certificate</CodeValue>
<ShortDescription>Graduated with Certificate of Completion</ShortDescription>
<Description>Student exited the Special Education program and related services because of graduating with a certificate of completion.</Description>
<Namespace>uri://ed-fi.org/SpecialEducationExitReasonDescriptor</Namespace>
</SpecialEducationExitReasonDescriptor>
<SpecialEducationExitReasonDescriptor>
<CodeValue>Reached the age limit</CodeValue>
<ShortDescription>Reached the maximum age limit for services</ShortDescription>
<Description>Student exited the Special Education program and related services because of an ineligibility other than reaching the maximum age limit.</Description>
<Namespace>uri://ed-fi.org/SpecialEducationExitReasonDescriptor</Namespace>
</SpecialEducationExitReasonDescriptor>
<SpecialEducationExitReasonDescriptor>
<CodeValue>No longer eligible for Special Education</CodeValue>
<ShortDescription>No longer eligible for Special Education</ShortDescription>
<Description>Student exited the Special Education program and related services because of an ineligibility other than reaching age limit</Description>
<Namespace>uri://ed-fi.org/SpecialEducationExitReasonDescriptor</Namespace>
</SpecialEducationExitReasonDescriptor>
<SpecialEducationExitReasonDescriptor>
<CodeValue>Dropped out</CodeValue>
<ShortDescription>Dropped out of school</ShortDescription>
<Description>Student exited the Special Education program and related services because of dropping out of school.</Description>
<Namespace>uri://ed-fi.org/SpecialEducationExitReasonDescriptor</Namespace>
</SpecialEducationExitReasonDescriptor>
<SpecialEducationExitReasonDescriptor>
<CodeValue>Other</CodeValue>
<ShortDescription>Other</ShortDescription>
<Description>Student exited the Special Education program and related services for any reason other than listed in the descriptor.</Description>
<Namespace>uri://ed-fi.org/SpecialEducationExitReasonDescriptor</Namespace>
</SpecialEducationExitReasonDescriptor>
</InterchangeDescriptors>
39 changes: 39 additions & 0 deletions Descriptors/SupporterMilitaryConnection.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<InterchangeDescriptors xmlns="http://ed-fi.org/5.0.0" xmlns:ann="http://ed-fi.org/annotation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ed-fi.org/5.0.0 ../Schemas/Bulk/Interchange-Descriptors.xsd">
<SupporterMilitaryConnectionDescriptor>
<CodeValue>Active Duty</CodeValue>
<ShortDescription>Student is a dependent of a (full-time) member of the military</ShortDescription>
<Description>Student is a dependent of a member of the Active Duty Forces (full-time) Army, Navy, Air Force, Space Force, Marine Corps, or Coast Guard or a member on full-time National Guard duty</Description>
<Namespace>uri://ed-fi.org/SupporterMilitaryConnectionDescriptor</Namespace>
</SupporterMilitaryConnectionDescriptor>
<SupporterMilitaryConnectionDescriptor>
<CodeValue>Reserve</CodeValue>
<ShortDescription>Student is a dependent of a member of reserve forces or national guard</ShortDescription>
<Description>Student is a dependent of a member of the National Guard (not full-time) or the Reserve Forces Army, Navy, Air Force, Space Force, Marine Corps or Coast Guard</Description>
<Namespace>uri://ed-fi.org/SupporterMilitaryConnectionDescriptor</Namespace>
</SupporterMilitaryConnectionDescriptor>
<SupporterMilitaryConnectionDescriptor>
<CodeValue>Veteran</CodeValue>
<ShortDescription>Student is a dependent of a discharged military personnel or a retiree</ShortDescription>
<Description>Student is a dependent of a person who has served in the US military and become discharged or released or got retired after completing required amount of years of military services</Description>
<Namespace>uri://ed-fi.org/SupporterMilitaryConnectionDescriptor</Namespace>
</SupporterMilitaryConnectionDescriptor>
<SupporterMilitaryConnectionDescriptor>
<CodeValue>DoD Civilian</CodeValue>
<ShortDescription>Student is a dependent of a civil servant to the DoD</ShortDescription>
<Description>Student is a dependent of a person who is employed by the Department of Defense as a civil servant</Description>
<Namespace>uri://ed-fi.org/SupporterMilitaryConnectionDescriptor</Namespace>
</SupporterMilitaryConnectionDescriptor>
<SupporterMilitaryConnectionDescriptor>
<CodeValue>Not Military Connected</CodeValue>
<ShortDescription>People who the student is a dependent of is/are not military connected</ShortDescription>
<Description>Contact does not have a connection with military or department of defense as an employee or retiree</Description>
<Namespace>uri://ed-fi.org/SupporterMilitaryConnectionDescriptor</Namespace>
</SupporterMilitaryConnectionDescriptor>
<SupporterMilitaryConnectionDescriptor>
<CodeValue>Unknown</CodeValue>
<ShortDescription>Military connection information is unknown</ShortDescription>
<Description>It is unknown whether or not the student is a dependent of a person who is military-connected</Description>
<Namespace>uri://ed-fi.org/SupporterMilitaryConnectionDescriptor</Namespace>
</SupporterMilitaryConnectionDescriptor>
</InterchangeDescriptors>
Binary file modified Models/Ed-Fi Unifying Data Model UML.vsdx
Binary file not shown.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ The Ed-Fi Data Standard serves as the foundation for enabling interoperability a

For more information, see:

* [Ed-Fi Data Standard in Tech Docs](https://techdocs.ed-fi.org/display/ETKB/Ed-Fi+Data+Standard)
* [How to Submit an Issue](https://techdocs.ed-fi.org/display/ETKB/How+To%3A+Submit+an+Issue)
* [How Submit a Feature Request](https://techdocs.ed-fi.org/display/ETKB/How+To%3A+Submit+a+Feature+Request)
* [Ed-Fi Standards in Tech Docs](https://techdocs.ed-fi.org/display/ETKB/Ed-Fi+Standards)
* [How To: Get Technical Help or Provide Feedback](https://techdocs.ed-fi.org/display/ETKB/How+To%3A+Get+Technical+Help+or+Provide+Feedback)
* Review on-going development work in the [Ed-Fi Data Standard](https://tracker.ed-fi.org/projects/DATASTD/) project in Tracker

## Legal Information

Copyright (c) 2020 Ed-Fi Alliance, LLC and contributors.
Copyright (c) 2023 Ed-Fi Alliance, LLC and contributors.

Licensed under the [Apache License, Version 2.0](LICENSE) (the "License").

Expand Down
18 changes: 18 additions & 0 deletions Samples/Sample XML/EducationOrgCalendar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#First Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Exam 1</GradingPeriodName>
<PeriodSequence>1</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-08-23</BeginDate>
Expand All @@ -116,6 +117,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#First Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Exam 1</GradingPeriodName>
<PeriodSequence>1</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-08-23</BeginDate>
Expand All @@ -129,6 +131,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#First Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Exam 1</GradingPeriodName>
<PeriodSequence>1</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-08-23</BeginDate>
Expand All @@ -142,6 +145,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Second Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Exam 2</GradingPeriodName>
<PeriodSequence>2</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-10-04</BeginDate>
Expand All @@ -155,6 +159,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Second Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Exam 2</GradingPeriodName>
<PeriodSequence>2</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-10-04</BeginDate>
Expand All @@ -168,6 +173,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Second Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Exam 2</GradingPeriodName>
<PeriodSequence>2</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-10-04</BeginDate>
Expand All @@ -181,6 +187,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Third Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Final Exam</GradingPeriodName>
<PeriodSequence>3</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-11-08</BeginDate>
Expand All @@ -194,6 +201,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Third Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Final Exam</GradingPeriodName>
<PeriodSequence>3</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-11-08</BeginDate>
Expand All @@ -207,6 +215,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Third Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Fall Semester Final Exam</GradingPeriodName>
<PeriodSequence>3</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2021-11-08</BeginDate>
Expand All @@ -220,6 +229,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Fourth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Exam 1</GradingPeriodName>
<PeriodSequence>4</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-01-04</BeginDate>
Expand All @@ -233,6 +243,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Fourth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Exam 1</GradingPeriodName>
<PeriodSequence>4</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-01-04</BeginDate>
Expand All @@ -246,6 +257,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Fourth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Exam 1</GradingPeriodName>
<PeriodSequence>4</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-01-04</BeginDate>
Expand All @@ -259,6 +271,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Fifth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Exam 2</GradingPeriodName>
<PeriodSequence>5</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-02-22</BeginDate>
Expand All @@ -272,6 +285,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Fifth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Exam 2</GradingPeriodName>
<PeriodSequence>5</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-02-22</BeginDate>
Expand All @@ -285,6 +299,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Fifth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Exam 2</GradingPeriodName>
<PeriodSequence>5</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-02-22</BeginDate>
Expand All @@ -298,6 +313,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Sixth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Final Exam</GradingPeriodName>
<PeriodSequence>6</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-04-11</BeginDate>
Expand All @@ -311,6 +327,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Sixth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Final Exam</GradingPeriodName>
<PeriodSequence>6</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-04-11</BeginDate>
Expand All @@ -324,6 +341,7 @@
</SchoolIdentity>
</SchoolReference>
<GradingPeriod>uri://ed-fi.org/GradingPeriodDescriptor#Sixth Six Weeks</GradingPeriod>
<GradingPeriodName>2021-2022 Spring Semester Final Exam</GradingPeriodName>
<PeriodSequence>6</PeriodSequence>
<SchoolYear>2021-2022</SchoolYear>
<BeginDate>2022-04-11</BeginDate>
Expand Down
Loading

0 comments on commit 17ee06d

Please sign in to comment.