diff --git a/app/naprrql/reporting_templates/school/isrPrintingExpanded.gql b/app/naprrql/reporting_templates/school/isrPrintingExpanded.gql index 626d49b..a432a88 100644 --- a/app/naprrql/reporting_templates/school/isrPrintingExpanded.gql +++ b/app/naprrql/reporting_templates/school/isrPrintingExpanded.gql @@ -52,25 +52,30 @@ query ISRPrinting($acaraIDs: [String]) { R_Comment R_Participation R_Pathway + R_Stddec W_Score W_Mean W_Comment W_Participation W_Pathway + W_Stddev S_Score S_Mean S_Comment S_Participation S_Pathway + S_Stddev G_Score G_Mean G_Comment G_Participation G_Pathway + G_Stddev N_Score N_Mean N_Comment N_Participation N_Pathway + N_Stddev } } diff --git a/app/naprrql/reporting_templates/school/isrPrintingExpanded_map.csv b/app/naprrql/reporting_templates/school/isrPrintingExpanded_map.csv index dd90142..488ffaa 100644 --- a/app/naprrql/reporting_templates/school/isrPrintingExpanded_map.csv +++ b/app/naprrql/reporting_templates/school/isrPrintingExpanded_map.csv @@ -1,2 +1,2 @@ -EDID,First Name,Last Name,Date of Birth,Year Level,Sex,Indigenous Status,LBOTE Status,Parent 1 School Education,Parent 1 Non-School Education,Parent 1 Occupation,Parent 2 School Education,Parent 2 Non-School Education,Parent 2 Occupation,Student LOTE,Parent 1 LOTE,Parent 2 LOTE,Country of Birth,Local School Student ID,Diocesan Student ID,TAA Student ID,Platform Student ID,Previous Local School Student ID,Previous Diocesan Student ID,Previous TAA Student ID,Previous Platform Student ID,Education Support,Full Fee Paying Student,Visa Code,Home Schooled Student,Sensitive,Address Line 1,Address Line 2,Locality,Postcode,State,School Code,School Name,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway -Student.LocalId,Student.GivenName,Student.FamilyName,Student.BirthDate,Student.TestLevel,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Student.StudentLOTE,Student.Parent1LOTE,Student.Parent2LOTE,Student.CountryOfBirth,Student.LocalId,Student.OtherIdList.OtherId.#[Type==DiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==TAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousLocalId].Value,Student.OtherIdList.OtherId.#[Type==PreviousDiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousTAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousNAPPlatformStudentId].Value,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Student.EducationSupport,Student.FFPOS,Student.VisaCode,Student.HomeSchooledStudent,Student.Sensitive,Student.AddressLine1,Student.AddressLine2,Student.Locality,Student.Postcode,Student.StateTerritory,SchoolID,SchoolName,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway +EDID,First Name,Last Name,Date of Birth,Year Level,Sex,Indigenous Status,LBOTE Status,Parent 1 School Education,Parent 1 Non-School Education,Parent 1 Occupation,Parent 2 School Education,Parent 2 Non-School Education,Parent 2 Occupation,Student LOTE,Parent 1 LOTE,Parent 2 LOTE,Country of Birth,Local School Student ID,Diocesan Student ID,TAA Student ID,Platform Student ID,Previous Local School Student ID,Previous Diocesan Student ID,Previous TAA Student ID,Previous Platform Student ID,Education Support,Full Fee Paying Student,Visa Code,Home Schooled Student,Sensitive,Address Line 1,Address Line 2,Locality,Postcode,State,School Code,School Name,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway,R_Stddev,W_Stddev,S_Stddev,G_Stddev,N_Stddev +Student.LocalId,Student.GivenName,Student.FamilyName,Student.BirthDate,Student.TestLevel,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Student.StudentLOTE,Student.Parent1LOTE,Student.Parent2LOTE,Student.CountryOfBirth,Student.LocalId,Student.OtherIdList.OtherId.#[Type==DiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==TAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousLocalId].Value,Student.OtherIdList.OtherId.#[Type==PreviousDiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousTAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousNAPPlatformStudentId].Value,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Student.EducationSupport,Student.FFPOS,Student.VisaCode,Student.HomeSchooledStudent,Student.Sensitive,Student.AddressLine1,Student.AddressLine2,Student.Locality,Student.Postcode,Student.StateTerritory,SchoolID,SchoolName,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway,R_Stddev,W_Stddev,S_Stddev,G_Stddev,N_Stddev diff --git a/app/naprrql/reporting_templates/system/isrPrintingExpanded.gql b/app/naprrql/reporting_templates/system/isrPrintingExpanded.gql index 626d49b..a432a88 100644 --- a/app/naprrql/reporting_templates/system/isrPrintingExpanded.gql +++ b/app/naprrql/reporting_templates/system/isrPrintingExpanded.gql @@ -52,25 +52,30 @@ query ISRPrinting($acaraIDs: [String]) { R_Comment R_Participation R_Pathway + R_Stddec W_Score W_Mean W_Comment W_Participation W_Pathway + W_Stddev S_Score S_Mean S_Comment S_Participation S_Pathway + S_Stddev G_Score G_Mean G_Comment G_Participation G_Pathway + G_Stddev N_Score N_Mean N_Comment N_Participation N_Pathway + N_Stddev } } diff --git a/app/naprrql/reporting_templates/system/isrPrintingExpanded_map.csv b/app/naprrql/reporting_templates/system/isrPrintingExpanded_map.csv index dd90142..488ffaa 100644 --- a/app/naprrql/reporting_templates/system/isrPrintingExpanded_map.csv +++ b/app/naprrql/reporting_templates/system/isrPrintingExpanded_map.csv @@ -1,2 +1,2 @@ -EDID,First Name,Last Name,Date of Birth,Year Level,Sex,Indigenous Status,LBOTE Status,Parent 1 School Education,Parent 1 Non-School Education,Parent 1 Occupation,Parent 2 School Education,Parent 2 Non-School Education,Parent 2 Occupation,Student LOTE,Parent 1 LOTE,Parent 2 LOTE,Country of Birth,Local School Student ID,Diocesan Student ID,TAA Student ID,Platform Student ID,Previous Local School Student ID,Previous Diocesan Student ID,Previous TAA Student ID,Previous Platform Student ID,Education Support,Full Fee Paying Student,Visa Code,Home Schooled Student,Sensitive,Address Line 1,Address Line 2,Locality,Postcode,State,School Code,School Name,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway -Student.LocalId,Student.GivenName,Student.FamilyName,Student.BirthDate,Student.TestLevel,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Student.StudentLOTE,Student.Parent1LOTE,Student.Parent2LOTE,Student.CountryOfBirth,Student.LocalId,Student.OtherIdList.OtherId.#[Type==DiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==TAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousLocalId].Value,Student.OtherIdList.OtherId.#[Type==PreviousDiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousTAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousNAPPlatformStudentId].Value,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Student.EducationSupport,Student.FFPOS,Student.VisaCode,Student.HomeSchooledStudent,Student.Sensitive,Student.AddressLine1,Student.AddressLine2,Student.Locality,Student.Postcode,Student.StateTerritory,SchoolID,SchoolName,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway +EDID,First Name,Last Name,Date of Birth,Year Level,Sex,Indigenous Status,LBOTE Status,Parent 1 School Education,Parent 1 Non-School Education,Parent 1 Occupation,Parent 2 School Education,Parent 2 Non-School Education,Parent 2 Occupation,Student LOTE,Parent 1 LOTE,Parent 2 LOTE,Country of Birth,Local School Student ID,Diocesan Student ID,TAA Student ID,Platform Student ID,Previous Local School Student ID,Previous Diocesan Student ID,Previous TAA Student ID,Previous Platform Student ID,Education Support,Full Fee Paying Student,Visa Code,Home Schooled Student,Sensitive,Address Line 1,Address Line 2,Locality,Postcode,State,School Code,School Name,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway,R_Stddev,W_Stddev,S_Stddev,G_Stddev,N_Stddev +Student.LocalId,Student.GivenName,Student.FamilyName,Student.BirthDate,Student.TestLevel,Student.Sex,Student.IndigenousStatus,Student.LBOTE,Student.Parent1SchoolEducation,Student.Parent1NonSchoolEducation,Student.Parent1Occupation,Student.Parent2SchoolEducation,Student.Parent2NonSchoolEducation,Student.Parent2Occupation,Student.StudentLOTE,Student.Parent1LOTE,Student.Parent2LOTE,Student.CountryOfBirth,Student.LocalId,Student.OtherIdList.OtherId.#[Type==DiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==TAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousLocalId].Value,Student.OtherIdList.OtherId.#[Type==PreviousDiocesanStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousTAAStudentId].Value,Student.OtherIdList.OtherId.#[Type==PreviousNAPPlatformStudentId].Value,Student.OtherIdList.OtherId.#[Type==NAPPlatformStudentId].Value,Student.EducationSupport,Student.FFPOS,Student.VisaCode,Student.HomeSchooledStudent,Student.Sensitive,Student.AddressLine1,Student.AddressLine2,Student.Locality,Student.Postcode,Student.StateTerritory,SchoolID,SchoolName,R_Score,W_Score,S_Score,G_Score,N_Score,R_Comment,W_Comment,S_Comment,G_Comment,N_Comment,R_Mean,W_Mean,S_Mean,G_Mean,N_Mean,R_Participation,W_Participation,S_Participation,G_Participation,N_Participation,R_Pathway,W_Pathway,S_Pathway,G_Pathway,N_Pathway,R_Stddev,W_Stddev,S_Stddev,G_Stddev,N_Stddev diff --git a/naprrql/isrprint-resolvers.go b/naprrql/isrprint-resolvers.go index 7a7cf4a..633dbf4 100644 --- a/naprrql/isrprint-resolvers.go +++ b/naprrql/isrprint-resolvers.go @@ -69,6 +69,11 @@ type ISRPrintItemExpanded struct { W_Pathway string S_Pathway string N_Pathway string + G_Stddev float64 + R_Stddev float64 + W_Stddev float64 + S_Stddev float64 + N_Stddev float64 } // @@ -167,26 +172,31 @@ func (isrpi *ISRPrintItemExpanded) allocateDomainScoreAndMeanAndParticipation(ev switch { case strings.Contains(domain, "gramm"): isrpi.G_Score, _ = strconv.ParseFloat(resp.ScaledScoreValue, 32) + isrpi.G_Stddev, _ = strconv.ParseFloat(resp.ScaledScoreStandardError, 32) isrpi.G_Mean, _ = strconv.ParseFloat(summary.DomainSchoolAverage, 32) isrpi.G_Participation = event.ParticipationCode isrpi.G_Pathway = pathway case strings.Contains(domain, "num"): isrpi.N_Score, _ = strconv.ParseFloat(resp.ScaledScoreValue, 32) + isrpi.N_Stddev, _ = strconv.ParseFloat(resp.ScaledScoreStandardError, 32) isrpi.N_Mean, _ = strconv.ParseFloat(summary.DomainSchoolAverage, 32) isrpi.N_Participation = event.ParticipationCode isrpi.N_Pathway = pathway case strings.Contains(domain, "read"): isrpi.R_Score, _ = strconv.ParseFloat(resp.ScaledScoreValue, 32) + isrpi.R_Stddev, _ = strconv.ParseFloat(resp.ScaledScoreStandardError, 32) isrpi.R_Mean, _ = strconv.ParseFloat(summary.DomainSchoolAverage, 32) isrpi.R_Participation = event.ParticipationCode isrpi.R_Pathway = pathway case strings.Contains(domain, "writ"): isrpi.W_Score, _ = strconv.ParseFloat(resp.ScaledScoreValue, 32) + isrpi.W_Stddev, _ = strconv.ParseFloat(resp.ScaledScoreStandardError, 32) isrpi.W_Mean, _ = strconv.ParseFloat(summary.DomainSchoolAverage, 32) isrpi.W_Participation = event.ParticipationCode isrpi.W_Pathway = pathway case strings.Contains(domain, "spell"): isrpi.S_Score, _ = strconv.ParseFloat(resp.ScaledScoreValue, 32) + isrpi.S_Stddev, _ = strconv.ParseFloat(resp.ScaledScoreStandardError, 32) isrpi.S_Mean, _ = strconv.ParseFloat(summary.DomainSchoolAverage, 32) isrpi.S_Participation = event.ParticipationCode isrpi.S_Pathway = pathway diff --git a/tools/tools b/tools/tools deleted file mode 100755 index 8cac747..0000000 Binary files a/tools/tools and /dev/null differ