Merge pull request #100 from nsip/cr_2020

update NIAS in line with change requests and period source data updates
nsip · Sep 15, 2020 · 99ae282 · 99ae282
2 parents f882f28 + f0ac691
commit 99ae282
Show file tree

Hide file tree

Showing 36 changed files with 277 additions and 121 deletions.
diff --git a/app/naprrql/reporting_templates/qa/itemWritingPrinting_map.csv b/app/naprrql/reporting_templates/qa/itemWritingPrinting_map.csv
@@ -1,2 +1,2 @@
-Test Name,Test level,Test Domain,ItemRefID,Test Item Local Id,Test Item Name,Subdomain,Writing Genre,Birth Date,ACARA ID,PSI,Testlet Score,Item Score,Item Lapsed Time,Item Response,Participation Code,NAPTestletLocalId,Response Correctness,ItemSubstitutedForList,Spelling,Audience,Text Structure,Paragraphs,Sentence structure,Punctuation,Ideas,Persuasive Devices,Vocabulary,Cohesion
-Test.TestContent.TestName,Test.TestContent.TestLevel,Test.TestContent.TestDomain,TestItem.ItemID,TestItem.TestItemContent.NAPTestItemLocalId,TestItem.TestItemContent.ItemName,TestItem.TestItemContent.Subdomain,TestItem.TestItemContent.WritingGenre,Student.BirthDate,Student.ASLSchoolId,Response.PSI,Response.TestletList.Testlet.0.TestletScore,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.Score,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.LapsedTimeItem,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.Response,ParticipationCode,Response.TestletList.Testlet.0.NapTestletLocalId,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.ResponseCorrectness,TestItem.TestItemContent.ItemSubstitutedForList,Spelling,Audience,TextStructure,Paragraphs,SentenceStructure,Punctuation,Ideas,PersuasiveDevices,Vocabulary,Cohesion
+Test Name,Test level,Test Domain,ItemRefID,Test Item Local Id,Test Item Name,Subdomain,Writing Genre,Birth Date,ACARA ID,PSI,Testlet Score,Item Score,Item Lapsed Time,Item Response,Participation Code,NAPTestletLocalId,Response Correctness,ItemSubstitutedForList,Spelling,Audience,Text structure,Paragraphing,Sentence structure,Punctuation,Ideas,Character and setting,Vocabulary,Cohesion
+Test.TestContent.TestName,Test.TestContent.TestLevel,Test.TestContent.TestDomain,TestItem.ItemID,TestItem.TestItemContent.NAPTestItemLocalId,TestItem.TestItemContent.ItemName,TestItem.TestItemContent.Subdomain,TestItem.TestItemContent.WritingGenre,Student.BirthDate,Student.ASLSchoolId,Response.PSI,Response.TestletList.Testlet.0.TestletScore,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.Score,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.LapsedTimeItem,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.Response,ParticipationCode,Response.TestletList.Testlet.0.NapTestletLocalId,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.ResponseCorrectness,TestItem.TestItemContent.ItemSubstitutedForList,Spelling,Audience,Text structure,Paragraphing,Sentence structure,Punctuation,Ideas,Character and setting,Vocabulary,Cohesion
diff --git a/app/naprrql/reporting_templates/system/nswAllPearsonY3_map.csv b/app/naprrql/reporting_templates/system/nswAllPearsonY3_map.csv
diff --git a/app/naprrql/reporting_templates/system/nswAllPearsonY5_map.csv b/app/naprrql/reporting_templates/system/nswAllPearsonY5_map.csv
diff --git a/app/naprrql/reporting_templates/system/nswAllPearsonY7_map.csv b/app/naprrql/reporting_templates/system/nswAllPearsonY7_map.csv
diff --git a/app/naprrql/reporting_templates/system/nswAllPearsonY9_map.csv b/app/naprrql/reporting_templates/system/nswAllPearsonY9_map.csv
diff --git a/app/naprrql/reporting_templates/system/nswPrintAll_map.csv b/app/naprrql/reporting_templates/system/nswPrintAll_map.csv
diff --git a/app/naprrql/reporting_templates/system/nswPrint_map.csv b/app/naprrql/reporting_templates/system/nswPrint_map.csv
diff --git a/app/naprrql/reporting_templates/system/nswWritingPearsonY3_map.csv b/app/naprrql/reporting_templates/system/nswWritingPearsonY3_map.csv
@@ -1,3 +1,3 @@
 FixedFormat
-3,4,09,15,1,1,8,1,1,1,1,1,1,1,1,1,1,10,1,1,1,1,1,1,1,1,1,1,54,60
-Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
+3,4,09,15,1,1,8,1,1,1,1,1,1,1,1,1,1,10,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,54,60
+Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Audience].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Text structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Ideas].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Character and setting].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Vocabulary].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Cohesion].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Paragraphing].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Sentence structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Punctuation].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Spelling].SubscoreValue,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
diff --git a/app/naprrql/reporting_templates/system/nswWritingPearsonY5_map.csv b/app/naprrql/reporting_templates/system/nswWritingPearsonY5_map.csv
@@ -1,3 +1,3 @@
 FixedFormat
 3,4,09,15,1,1,8,1,1,1,1,1,1,1,1,1,1,10,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,54,60
-Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Audience].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Text Structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Ideas].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Character and setting].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Vocabulary].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Cohesion].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Paragraphs].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Sentence structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Punctuation].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Spelling].SubscoreValue,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
+Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Audience].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Text structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Ideas].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Character and setting].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Vocabulary].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Cohesion].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Paragraphs].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Sentence structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Punctuation].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Spelling].SubscoreValue,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
diff --git a/app/naprrql/reporting_templates/system/nswWritingPearsonY7_map.csv b/app/naprrql/reporting_templates/system/nswWritingPearsonY7_map.csv
@@ -1,3 +1,3 @@
 FixedFormat
 3,4,09,15,1,1,8,1,1,1,1,1,1,1,1,1,1,10,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,54,60
-Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Audience].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Text Structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Ideas].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Character and setting].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Vocabulary].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Cohesion].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Paragraphs].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Sentence structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Punctuation].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Spelling].SubscoreValue,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
+Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Audience].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Text structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Ideas].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Character and setting].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Vocabulary].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Cohesion].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Paragraphing].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Sentence structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Punctuation].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Spelling].SubscoreValue,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
diff --git a/app/naprrql/reporting_templates/system/nswWritingPearsonY9_map.csv b/app/naprrql/reporting_templates/system/nswWritingPearsonY9_map.csv
@@ -1,3 +1,3 @@
 FixedFormat
 3,4,09,15,1,1,8,1,1,1,1,1,1,1,1,1,1,10,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,54,60
-Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Audience].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Text Structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Ideas].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Character and setting].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Vocabulary].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Cohesion].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Paragraphs].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Sentence structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Punctuation].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Spelling].SubscoreValue,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
+Event.NAPJurisdiction,Test.TestContent.TestLevel,SchoolDetails.ACARAId,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Event.SchoolGeolocation,Event.SchoolSector,Student.BirthDate,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Event.ParticipationCode,Blank,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Audience].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Text structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Ideas].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Character and setting].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Vocabulary].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Cohesion].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Paragraphs].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Sentence structure].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Punctuation].SubscoreValue,Response.TestletList.Testlet.0.ItemResponseList.ItemResponse.0.SubscoreList.Subscore.#[SubscoreType==Spelling].SubscoreValue,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,Blank,SchoolDetails.SchoolName
diff --git a/app/naprrql/reporting_templates/system/qcaa_napo_items_map.csv b/app/naprrql/reporting_templates/system/qcaa_napo_items_map.csv
@@ -1,2 +1,2 @@
 REF_ID,TEST_ID,ITEM_ID,NAME,ITEM_TYPE,SUBDOMAIN,DESCRIPTOR,MC_OPTIONS,CORRECT_ANSWER,MAXIMUM_SCORE,ITEM_DIFFICULTY,ITEM_DIFFICULTYLOGIT5,ITEM_DIFFICULTYLOGIT62,ITEM_DIFFICULTYLOGIT5SE,ITEM_DIFFICULTYLOGIT62SE,ITEM_PROFICIENCY_BAND,ITEM_PROFICIENCY_LEVEL,CONTENT_DESCRIPTION,SUBSTITUTE_ITEM_ID
-Item.ItemID,Test.TestID,Item.TestItemContent.NAPTestItemLocalId,Item.TestItemContent.ItemName,Item.TestItemContent.ItemType,Item.TestItemContent.Subdomain,Item.TestItemContent.ItemDescriptor,Item.TestItemContent.MultipleChoiceOptionCount,Item.TestItemContent.CorrectAnswer,Item.TestItemContent.MaximumScore,Item.TestItemContent.ItemDifficulty,Item.TestItemContent.ItemDifficultyLogit5,Item.TestItemContent.ItemDifficultyLogit62,Item.TestItemContent.ItemDifficultyLogit5SE,Item.TestItemContent.ItemDifficultyLogit62SE,Item.TestItemContent.ItemProficiencyBand,Item.TestItemContent.ItemProficiencyLevel,Item.TestItemContent.ContentDescriptionList.ContentDescription,Item.ItemSubstitutedForList.SubstituteItem.SubstituteItemRefId
+Item.ItemID,Test.TestID,Item.TestItemContent.NAPTestItemLocalId,Item.TestItemContent.ItemName,Item.TestItemContent.ItemType,Item.TestItemContent.Subdomain,Item.TestItemContent.ItemDescriptor,Item.TestItemContent.MultipleChoiceOptionCount,Item.TestItemContent.CorrectAnswer,Item.TestItemContent.MaximumScore,Item.TestItemContent.ItemDifficulty,Item.TestItemContent.ItemDifficultyLogit5,Item.TestItemContent.ItemDifficultyLogit62,Item.TestItemContent.ItemDifficultyLogit5SE,Item.TestItemContent.ItemDifficultyLogit62SE,Item.TestItemContent.ItemProficiencyBand,Item.TestItemContent.ItemProficiencyLevel,Item.TestItemContent.ContentDescriptionList.ContentDescription,Item.TestItemContent.ItemSubstitutedForList.SubstituteItem.SubstituteItemRefId
diff --git a/app/naprrql/reporting_templates/system/qcaa_napo_student_responses.gql b/app/naprrql/reporting_templates/system/qcaa_napo_student_responses.gql
@@ -2,15 +2,12 @@ query NAPItemResults($acaraIDs: [String]) {
   item_results_report_by_school(acaraIDs: $acaraIDs) {
     Test {
       TestID
-      }
     }
     Testlet {
       TestletID
-      }
     }
     TestItem {
       ItemID
-      }
     }
     Response {
       ResponseID

diff --git a/app/naprrql/reporting_templates/system/qcecPrintAll_map.csv b/app/naprrql/reporting_templates/system/qcecPrintAll_map.csv
diff --git a/app/naprrql/sif.minimal.xml.zip b/app/naprrql/sif.minimal.xml.zip