From a3a6448d9f2fd9ef548b2e6e806454f76252398c Mon Sep 17 00:00:00 2001 From: bamcknight Date: Sat, 9 Dec 2017 12:30:01 -0600 Subject: [PATCH] [DATASTD-1096] - Resolve descriptor discrepancies --- .../Ed-Fi/AssessmentPeriodDescriptor.xml | 2 -- ...ContinuationOfServicesReasonDescriptor.xml | 8 ++--- .../Ed-Fi/DisciplineDescriptor.xml | 12 -------- .../Ed-Fi/ReasonExitedDescriptor.xml | 4 +-- ...choolFoodServicesEligibilityDescriptor.xml | 8 ++--- .../SpecialEducationSettingDescriptor.xml | 4 +-- ... => TeachingCredentialBasisDescriptor.xml} | 0 ...r.xml => TeachingCredentialDescriptor.xml} | 30 +++++++++---------- 8 files changed, 27 insertions(+), 41 deletions(-) rename v3.0/Samples/Sample XML/Descriptors/Ed-Fi/{TeachingCreentialBasisDescriptor.xml => TeachingCredentialBasisDescriptor.xml} (100%) rename v3.0/Samples/Sample XML/Descriptors/Ed-Fi/{TeachingCredentialTypeDescriptor.xml => TeachingCredentialDescriptor.xml} (70%) diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/AssessmentPeriodDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/AssessmentPeriodDescriptor.xml index 463fead4..e8f6a4ea 100644 --- a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/AssessmentPeriodDescriptor.xml +++ b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/AssessmentPeriodDescriptor.xml @@ -17,7 +17,5 @@ EOY End of Year http://ed-fi.org/Descriptor/AssessmentPeriodDescriptor.xml - 2013-01-05 - 2013-06-15 diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ContinuationOfServicesReasonDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ContinuationOfServicesReasonDescriptor.xml index 4e6cce55..60477136 100644 --- a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ContinuationOfServicesReasonDescriptor.xml +++ b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ContinuationOfServicesReasonDescriptor.xml @@ -1,8 +1,8 @@ - Ceased to be migratory during prev term and no com - Ceased to be migratory during prev term and no comparable servcs avail + Ceased to be migratory during previous term + Ceased to be migratory in previous term - comparable services not available Ceased to be migratory during previous school term and no comparable services are available http://ed-fi.org/Descriptor/ContinuationofServicesReasonDescriptor.xml @@ -13,8 +13,8 @@ http://ed-fi.org/Descriptor/ContinuationofServicesReasonDescriptor.xml - Prev migratory scndry student continuing scndry sc - Prev migratory scndry student continuing scndry school credit accrual + Previously migratory secondary student + Previously migratory secondary student continuing credit accrual Previously migratory secondary student continuing secondary school credit accrual http://ed-fi.org/Descriptor/ContinuationofServicesReasonDescriptor.xml diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/DisciplineDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/DisciplineDescriptor.xml index bc4c294b..88aece09 100644 --- a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/DisciplineDescriptor.xml +++ b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/DisciplineDescriptor.xml @@ -48,16 +48,4 @@ No action for incident http://ed-fi.org/Descriptor/DisciplineDescriptor.xml - - In-School Suspension - In-School Suspension - In-School Suspension - http://ed-fi.org/Descriptor/DisciplineDescriptor.xml - - - Out-Of-School Suspension - Out-Of-School Suspension - Out-Of-School Suspension - http://ed-fi.org/Descriptor/DisciplineDescriptor.xml - \ No newline at end of file diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ReasonExitedDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ReasonExitedDescriptor.xml index 94217058..3daeb39b 100644 --- a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ReasonExitedDescriptor.xml +++ b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/ReasonExitedDescriptor.xml @@ -37,8 +37,8 @@ http://ed-fi.org/Descriptor/ReasonExitedDescriptor.xml - Received cert of completion, modified diploma, or - Received cert of completion, modified diploma, or finished IEP requirements + Received certificate of completion or equivalent + Received completion certificate, modified diploma, or met IEP requirements Received certificate of completion, modified diploma, or finished IEP requirements http://ed-fi.org/Descriptor/ReasonExitedDescriptor.xml diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SchoolFoodServicesEligibilityDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SchoolFoodServicesEligibilityDescriptor.xml index 5277907e..7e4b7210 100644 --- a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SchoolFoodServicesEligibilityDescriptor.xml +++ b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SchoolFoodServicesEligibilityDescriptor.xml @@ -7,14 +7,14 @@ http://ed-fi.org/Descriptor/SchoolFoodServicesEligibilityDescriptor.xml - FullPrice - FullPrice + Full Price + Full Price Full price http://ed-fi.org/Descriptor/SchoolFoodServicesEligibilityDescriptor.xml - ReducedPrice - ReducedPrice + Reduced Price + Reduced Price Reduced price http://ed-fi.org/Descriptor/SchoolFoodServicesEligibilityDescriptor.xml diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SpecialEducationSettingDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SpecialEducationSettingDescriptor.xml index 5586ef84..0f50d149 100644 --- a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SpecialEducationSettingDescriptor.xml +++ b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/SpecialEducationSettingDescriptor.xml @@ -25,8 +25,8 @@ http://ed-fi.org/Descriptor/SpecialEducationSettingDescriptor.xml - Inside reg class between 40% and 79% of the day - Inside regular class no more than 79% of dy and no less than 40% of the dy + Inside reg class between 40-79% of the day + Inside reg class between 40-79% of the day Inside regular class no more than 79% of day and no less than 40% of the day http://ed-fi.org/Descriptor/SpecialEducationSettingDescriptor.xml diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCreentialBasisDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialBasisDescriptor.xml similarity index 100% rename from v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCreentialBasisDescriptor.xml rename to v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialBasisDescriptor.xml diff --git a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialTypeDescriptor.xml b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialDescriptor.xml similarity index 70% rename from v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialTypeDescriptor.xml rename to v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialDescriptor.xml index 582b2c24..cbd337e4 100644 --- a/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialTypeDescriptor.xml +++ b/v3.0/Samples/Sample XML/Descriptors/Ed-Fi/TeachingCredentialDescriptor.xml @@ -4,90 +4,90 @@ Emergency Emergency Emergency - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Intern Intern Intern - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Master Master Master - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Nonrenewable Nonrenewable Nonrenewable - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Other Other Other - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Paraprofessional Paraprofessional Paraprofessional - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Probationary/Initial Probationary/Initial Probationary/Initial - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Professional Professional Professional - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Provisional Provisional Provisional - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Regular/Standard Regular/Standard Regular/Standard - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Retired Retired Retired - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Specialist Specialist Specialist - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Substitute Substitute Substitute - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Teacher Assistant Teacher Assistant Teacher Assistant - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml Temporary Temporary Temporary - http://ed-fi.org/Descriptor/TeachingCredentialTypeDescriptor.xml + http://ed-fi.org/Descriptor/TeachingCredentialDescriptor.xml \ No newline at end of file