Merge pull request #261 from Ed-Fi-Alliance/development

Releasing 3.0 Data Standard to master branch
Ed-Fi-Alliance · May 31, 2018 · 0b7c0e0 · 0b7c0e0
2 parents 4716de9 + e707268
commit 0b7c0e0
Show file tree

Hide file tree

Showing 613 changed files with 14,171,039 additions and 6,013,063 deletions.
diff --git a/v2.0/Models/Ed-Fi Unifying Data Model UML.vsdx b/v2.0/Models/Ed-Fi Unifying Data Model UML.vsdx
diff --git a/v2.0/Samples/Sample XML/StudentAssessment-Benchmarks-7th Grade ELA 2nd Six Weeks.xml b/v2.0/Samples/Sample XML/StudentAssessment-Benchmarks-7th Grade ELA 2nd Six Weeks.xml
diff --git a/v2.0/Samples/Sample XML/StudentAssessment-StateAssessment.xml b/v2.0/Samples/Sample XML/StudentAssessment-StateAssessment.xml
diff --git a/v2.0/Samples/Sample XML/StudentDiscipline.xml b/v2.0/Samples/Sample XML/StudentDiscipline.xml
@@ -374,7 +374,7 @@
 		</Behavior>
 		<Weapon>
 			<CodeValue>Knife</CodeValue>
-			<Namespace>http://ed-fi.org/Descriptor/WeaponsDescriptor.xml</Namespace>
+			<Namespace>http://ed-fi.org/Descriptor/WeaponDescriptor.xml</Namespace>
 		</Weapon>
 		<ReportedToLawEnforcement>false</ReportedToLawEnforcement>
 		<SchoolReference>

diff --git a/v2.0/Schemas/Ed-Fi-Core.xsd b/v2.0/Schemas/Ed-Fi-Core.xsd
diff --git a/v2.1/Samples/Sample XML/AssessmentMetadata-ACT.xml b/v2.1/Samples/Sample XML/AssessmentMetadata-ACT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <InterchangeAssessmentMetadata xmlns="http://ed-fi.org/0210" xmlns:ann="http://ed-fi.org/annotation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ed-fi.org/0210 ../../Schemas/Bulk/Interchange-AssessmentMetadata.xsd">
-	<Assessment id="TA-ACT-English-1">
+	<Assessment>
 		<AssessmentTitle>ACT</AssessmentTitle>
 		<AssessmentIdentificationCode>
 			<IdentificationCode>ACT English</IdentificationCode>
@@ -38,7 +38,7 @@
 		<MaxRawScore>25</MaxRawScore>
 		<Namespace>http://ed-fi.org</Namespace>
 	</Assessment>
-	<Assessment id="TA-ACT-Math-1">
+	<Assessment>
 		<AssessmentTitle>ACT</AssessmentTitle>
 		<AssessmentIdentificationCode>
 			<IdentificationCode>ACT Mathematics</IdentificationCode>
@@ -76,7 +76,7 @@
 		<MaxRawScore>25</MaxRawScore>
 		<Namespace>http://ed-fi.org</Namespace>
 	</Assessment>
-	<Assessment id="TA-ACT-Reading-1">
+	<Assessment>
 		<AssessmentTitle>ACT</AssessmentTitle>
 		<AssessmentIdentificationCode>
 			<IdentificationCode>ACT Reading</IdentificationCode>
@@ -114,7 +114,7 @@
 		<MaxRawScore>25</MaxRawScore>
 		<Namespace>http://ed-fi.org</Namespace>
 	</Assessment>
-	<Assessment id="TA-ACT-Science-1">
+	<Assessment>
 		<AssessmentTitle>ACT</AssessmentTitle>
 		<AssessmentIdentificationCode>
 			<IdentificationCode>ACT Science</IdentificationCode>
@@ -152,7 +152,7 @@
 		<MaxRawScore>25</MaxRawScore>
 		<Namespace>http://ed-fi.org</Namespace>
 	</Assessment>
-	<Assessment id="TA-ACT-Composite-1">
+	<Assessment>
 		<AssessmentTitle>ACT</AssessmentTitle>
 		<AssessmentIdentificationCode>
 			<IdentificationCode>ACT Composite</IdentificationCode>
@@ -190,7 +190,7 @@
 		<MaxRawScore>30</MaxRawScore>
 		<Namespace>http://ed-fi.org</Namespace>
 	</Assessment>
-	<Assessment id="TA-ACT-Writing-1">
+	<Assessment>
 		<AssessmentTitle>ACT</AssessmentTitle>
 		<AssessmentIdentificationCode>
 			<IdentificationCode>ACT Writing</IdentificationCode>

diff --git a/...les/Sample XML/AssessmentMetadata-Benchmarks-10th Grade Algebra 2 PreAP 1st Six Weeks.xml b/...les/Sample XML/AssessmentMetadata-Benchmarks-10th Grade Algebra 2 PreAP 1st Six Weeks.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <InterchangeAssessmentMetadata xmlns="http://ed-fi.org/0210" xmlns:ann="http://ed-fi.org/annotation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://ed-fi.org/0210 ../../Schemas/Bulk/Interchange-AssessmentMetadata.xsd">
-	<Assessment id="TA-Benchmark-Mathematics-189470251241228195604465">
+	<Assessment>
 		<AssessmentTitle>Algebra 2 PreAP 1st Six Weeks 2012 - 2013</AssessmentTitle>
 		<AssessmentIdentificationCode>
 			<IdentificationCode>18f9d470-2512-4122-81cc-95cdc604d465</IdentificationCode>
@@ -27,7 +27,7 @@
 		<MaxRawScore>16</MaxRawScore>
 		<Namespace>http://ed-fi.org</Namespace>
 	</Assessment>
-	<AssessmentItem id="ID_1">
+	<AssessmentItem>
 		<IdentificationCode>9817346</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -52,7 +52,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_2">
+	<AssessmentItem>
 		<IdentificationCode>9817347</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -77,7 +77,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_3">
+	<AssessmentItem>
 		<IdentificationCode>9817348</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -102,7 +102,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_4">
+	<AssessmentItem>
 		<IdentificationCode>9817349</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -127,7 +127,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_5">
+	<AssessmentItem>
 		<IdentificationCode>9817350</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -152,7 +152,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_6">
+	<AssessmentItem>
 		<IdentificationCode>9817351</IdentificationCode>
 		<AssessmentItemCategory>Rubric</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -177,7 +177,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_7">
+	<AssessmentItem>
 		<IdentificationCode>9817352</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -202,7 +202,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_8">
+	<AssessmentItem>
 		<IdentificationCode>9817353</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -227,7 +227,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_9">
+	<AssessmentItem>
 		<IdentificationCode>9817354</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -252,7 +252,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_10">
+	<AssessmentItem>
 		<IdentificationCode>9817355</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -277,7 +277,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_11">
+	<AssessmentItem>
 		<IdentificationCode>9817356</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -302,7 +302,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_12">
+	<AssessmentItem>
 		<IdentificationCode>9817357</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -327,7 +327,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_13">
+	<AssessmentItem>
 		<IdentificationCode>9817358</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -352,7 +352,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_14">
+	<AssessmentItem>
 		<IdentificationCode>9817359</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -377,7 +377,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_15">
+	<AssessmentItem>
 		<IdentificationCode>9817360</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -402,7 +402,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_16">
+	<AssessmentItem>
 		<IdentificationCode>9817361</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -427,7 +427,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_17">
+	<AssessmentItem>
 		<IdentificationCode>9817362</IdentificationCode>
 		<AssessmentItemCategory>List Question</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -452,7 +452,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_18">
+	<AssessmentItem>
 		<IdentificationCode>9817363</IdentificationCode>
 		<AssessmentItemCategory>Rubric</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>
@@ -477,7 +477,7 @@
 			</AssessmentIdentity>
 		</AssessmentReference>
 	</AssessmentItem>
-	<AssessmentItem id="ID_19">
+	<AssessmentItem>
 		<IdentificationCode>9817364</IdentificationCode>
 		<AssessmentItemCategory>Rubric</AssessmentItemCategory>
 		<MaxRawScore>1</MaxRawScore>