Skip to content

Commit

Permalink
Merge pull request #101 from nsip/cr_2020
Browse files Browse the repository at this point in the history 
Cr 2020
  • Loading branch information
@matt-farmer
matt-farmer authored Sep 17, 2020
2 parents 99ae282 + 8bbd99e commit 9a5873f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/naprrql/reporting_templates/system/nswWritingPearsonY5_map.csv
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion app/naprrql/reporting_templates/system/nswWritingPearsonY9_map.csv
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion app/naprrql/test/out/qa/itemWritingPrinting.csv
View file
Original file line number Diff line number Diff line change
@@ -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,Character and setting,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
Writing Year 7,7,Writing,3283b4bf-6c75-4313-81a9-04915b67d4a8,x00101972,x00101972,Expressive Writing,Persuasive,2009-06-10,21212,R100000000K,,1,PT50S,vKwPtrgncA,P,x00101971,Correct,"{""SubstituteItem"":[]}",1,1,2,1,4,2,2,5,5,3
3 changes: 2 additions & 1 deletion naprrql/qa-erds-pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ func qaObjectFrequency(ctx context.Context, in <-chan gjson.Result) (<-chan gjso
for record := range in {
psi := record.Get("Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value").String()
participationcode := record.Get("Event.ParticipationCode").String()
testdomain := record.Get("Test.TestContent.TestDomain").String()
if participationcode == "AF" {
participationcode = "F"
}
Expand All @@ -390,7 +391,7 @@ func qaObjectFrequency(ctx context.Context, in <-chan gjson.Result) (<-chan gjso
counts[psi]["responses"] = make([]string, 0)
}
counts[psi]["events"] = append(counts[psi]["events"], eventcode)
if participationcode == "P" || participationcode == "R" || participationcode == "S" {
if participationcode == "P" || participationcode == "R" || participationcode == "S" || (participationcode == "F" && testdomain == "Writing") {
counts[psi]["events_with_response"] = append(counts[psi]["events_with_response"], eventcode)
}
if len(responseid) > 0 {
Expand Down
5 changes: 1 addition & 4 deletions naprrql/report-resolvers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,7 @@ func buildReportResolvers() map[string]interface{} {
}

resolvers["NaplanData/domain_scores_event_report_by_school_writing_yr3"] = func(params *graphql.ResolveParams) (interface{}, error) {
// TODO 2021
// If there are no Writing Yr 3 enrolments in the platform at all, we are cheating by providing the Numeracy enrolments instead
// Switch to Writing once confirmed that Yr 3 Writing results will be included in RRD
return domain_scores_event_report_by_school(params, "3", "Numeracy")
return domain_scores_event_report_by_school(params, "3", "Writing")
}
resolvers["NaplanData/domain_scores_event_report_by_school_writing_yr5"] = func(params *graphql.ResolveParams) (interface{}, error) {
return domain_scores_event_report_by_school(params, "5", "Writing")
Expand Down

0 comments on commit 9a5873f

Please sign in to comment.