Skip to content

Commit

Permalink
SA feature requests
Browse files Browse the repository at this point in the history
  • Loading branch information
@opoudjis
opoudjis committed Oct 5, 2017
2 parents 4dedfb4 + 67ce002 commit d6b2c35
Show file tree
Hide file tree
Showing 18 changed files with 723 additions and 339 deletions.
2 changes: 1 addition & 1 deletion app/napcomp/in/registration/students.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,4 +599,4 @@ ywxno726,61757,83962,7149,39746,91421,35978,R100000042R,62662,18043,89978,18963,
mhnmb320,7547,67896,93569,90337,33538,10613,R100000123K,47680,33991,7839,11099,17493,6275,84961,R100000123K,Adams,Mildred,Mildred,,2001-12-11,2,1101,Y,1,101,4,Y,1201,9,9,0.53,9F,49453,6053,1,1,qnkmm683,49453,Y,N,Y,1,5,3,9601,4,7,3,1201,1624 S. Taylorville Rd.,,BLACKFORD,5275,SA
bbcev920,32583,17070,89576,84657,44158,69881,R100000130P,13902,79392,68324,79756,93375,48991,14445,R100000130P,Abe,Claude,Claude,R,2001-09-12,1,1101,X,1,101,3,N,1201,9,9,0.18,9B,49360,22782,1,1,geuuu654,49360,Y,Y,Y,2,7,4,1201,4,5,4,1201,1210 Bethlehem Pike,,BOOKABIE,5690,SA
dhevd393,94764,55144,38637,90446,14514,75693,R100000011H,9769,80987,91020,71475,48478,24612,88724,R100000011H,Abbott,Walter,Walter,E,2007-04-26,1,1101,N,1,101,4,N,1201,3,3,0.17,3E,49559,16481,1,2,armnc164,49559,Y,N,Y,1,6,2,1201,3,8,1,5203,3443 N. Southport Ave.,,FRANKLYN,5421,SA
dhevd393,94764,55144,38637,90446,14514,75693,R100000011H,9769,80987,91020,71475,48478,24612,88724,R6555003423,Tong,Bing,Bang,E,2007-04-26,1,1101,N,1,101,4,N,1201,3,3,0.17,3E,49559,16481,1,2,armnc164,49559,Y,N,Y,1,6,2,1201,3,8,1,5203,3443 N. Southport Ave.,,FRANKLYN,5421,SA
dhevd493,94764,55144,38637,90446,14514,75693,R100100011H,9769,80987,91020,71475,48478,24612,88724,R6555003423,Youngman,Genaro,Genaro,L,2003-07-19,1,1101,N,1,101,4,N,1201,3,3,0.17,3E,49559,16481,1,2,armnc164,49559,Y,N,Y,1,6,2,1201,3,8,1,5203,3443 N. Southport Ave.,,FRANKLYN,5421,SA
4 changes: 3 additions & 1 deletion app/naprrql/gql_schemas/naplan_schema.graphql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ type ParticipationSummary {

## Domain scores reporting object
type ResponseDataSet {
## The student who's participation is being reported
Student: RegistrationRecord
## the related test
Test: NAPTest
## the response from which the domain score will be derived
Expand Down Expand Up @@ -1015,4 +1017,4 @@ type SchoolDetails {





3 changes: 2 additions & 1 deletion app/naprrql/naprrql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ func ingestData() {
// launch the webserver
//
func startWebServer(silent bool) {
naprrql.GetDB(false) // Verify that the database is populated; if not will abort
go naprrql.RunQLServer()
if !silent {
fmt.Printf("\n\nBrowse to follwing locations:\n")
Expand Down Expand Up @@ -157,7 +158,7 @@ func parseResultsFileDirectory() []string {
//
func closeDB() {
log.Println("Closing datastore...")
naprrql.GetDB().Close()
naprrql.GetDB(true).Close()
log.Println("Datastore closed.")
}

Expand Down
19 changes: 14 additions & 5 deletions app/naprrql/public/js/naprr_domainscores.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ function domainScoresQuery() {
return `
query DomainScoresData($acaraIDs: [String]) {
domain_scores_report_by_school(acaraIDs: $acaraIDs) {
Student {
FamilyName
GivenName
}
Test {
TestID
TestContent {
Expand Down Expand Up @@ -156,7 +160,7 @@ function createDomainScoresReport()
}

//
// sort data - by year level & test domain for now
// sort data - by year level & test domain and student last then first name
//
function sortDomainScoresData(data)
{
Expand All @@ -170,11 +174,15 @@ function sortDomainScoresData(data)

var compA = (a.Test.TestContent.TestLevel || '').toUpperCase() +
(a.Test.TestContent.TestDomain || '').toUpperCase() +
(a.Response.DomainScore.StudentDomainBand || '').toUpperCase();
(a.Response.DomainScore.StudentDomainBand || '').toUpperCase() +
(a.Student.FamilyName || '').toUpperCase() +
(a.Student.GivenName || '').toUpperCase() ;

var compB = (b.Test.TestContent.TestLevel || '').toUpperCase() +
(b.Test.TestContent.TestDomain || '').toUpperCase() +
(b.Response.DomainScore.StudentDomainBand || '').toUpperCase();
(b.Response.DomainScore.StudentDomainBand || '').toUpperCase() +
(b.Student.FamilyName || '').toUpperCase() +
(b.Student.GivenName || '').toUpperCase() ;

return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
});
Expand Down Expand Up @@ -213,7 +221,7 @@ function createDomainScoresTableHeader()
var hdr = $("<tr></tr>");
var hdr_row = $("<th>Level</th>" +
"<th>Domain</th>" +
"<th>PSI</th>" +
"<th>Name</th>" +
"<th>Raw Score</th>" +
"<th>Scaled Score</th>" +
"<th>Scaled Score Std. Error</th>" +
Expand All @@ -240,7 +248,8 @@ function createDomainScoresTableBody(data)
var $row = $("<tr/>");
$row.append("<td>" + hideNull(rds.Test.TestContent.TestLevel) + "</td>" +
"<td>" + hideNull(rds.Test.TestContent.TestDomain) + "</td>" +
"<td>" + hideNull(rds.Response.PSI) + "</td>" +
//"<td>" + hideNull(rds.Response.PSI) + "</td>" +
"<td>" + hideNull(rds.Student.GivenName) + " " + hideNull(rds.Student.FamilyName) + "</td>" +
"<td>" + hideNull(rds.Response.DomainScore.RawScore) + "</td>" +
"<td>" + hideNull(rds.Response.DomainScore.ScaledScoreValue) + "</td>" +
"<td>" + hideNull(rds.Response.DomainScore.ScaledScoreStandardError) + "</td>" +
Expand Down
15 changes: 10 additions & 5 deletions app/naprrql/public/js/naprr_participation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,12 @@ function sortParticipationData(data) {

data.sort(function(a, b) {

var compA = (a.EventInfos[0].Test.TestContent.TestLevel || '').toUpperCase();
var compB = (b.EventInfos[0].Test.TestContent.TestLevel || '').toUpperCase();
var compA = (a.EventInfos[0].Test.TestContent.TestLevel || '').toUpperCase() +
(a.Student.FamilyName || '').toUpperCase() +
(a.Student.GivenName || '').toUpperCase() ;
var compB = (b.EventInfos[0].Test.TestContent.TestLevel || '').toUpperCase() +
(b.Student.FamilyName || '').toUpperCase() +
(b.Student.GivenName || '').toUpperCase() ;

return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
});
Expand Down Expand Up @@ -168,7 +172,7 @@ function createParticipationTableHeader() {

var hdr = $("<tr></tr>");
var hdr_row = $("<th>Level</th>" +
"<th>PSI</th>" +
"<th>Name</th>" +
"<th>G and P</th>" +
"<th>Numeracy</th>" +
"<th>Reading</th>" +
Expand Down Expand Up @@ -205,7 +209,8 @@ function createParticipationTableBody(data) {

var $row = $("<tr/>");
$row.append("<td>" + test.TestContent.TestLevel + "</td>" +
"<td>" + event.Event.PSI + "</td>" +
// "<td>" + event.Event.PSI + "</td>" +
"<td>" + pds.Student.GivenName + " " + pds.Student.FamilyName + "</td>" +
"<td class='domain'>" + hideNull(summary['Grammar and Punctuation']) + "</td>" +
"<td class='domain'>" + hideNull(summary['Numeracy']) + "</td>" +
"<td class='domain'>" + hideNull(summary['Reading']) + "</td>" +
Expand Down Expand Up @@ -384,4 +389,4 @@ function initParticipationDownloadLinkHandler() {
});


}
}
2 changes: 1 addition & 1 deletion app/naprrql/public/js/naprr_studentpersonal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function getStudentInfoSummaryLine(psi) {
found = true;
sp = studentpersonal;
sp_psi = oid.Value;
return false;
//return false;
}
}
});
Expand Down
3 changes: 3 additions & 0 deletions app/napval/napval.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ TestYear = "2017"
# ValidationRoute = ["schema", "local","schema2", "dob", "id","asl", "psi", "numericvalid"]
ValidationRoute = ["schema", "schema2", "dob", "id","asl", "psi", "numericvalid"]

# Data match fields for matching across schools
StudentMatch = ["FamilyName", "GivenName", "BirthDate"]

# Webserver port
WebServerPort = "1325"

Expand Down
6 changes: 6 additions & 0 deletions app/napval/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ <h4>Conditions of Data Use</h4>
</div>
<p id="upload-message"></p>
<p id="progress-message"></p>
<ul class="collapsible hide" data-collapsible="accordion" id="manifest_accordion" >
<li>
<div class="collapsible-header"><i class="material-icons">filter_drama</i>Records Manifest</div>
<div class="collapsible-body" id="manifest" style="margin: 5px;"></div>
</li>
</ul>
<p id="results-message"></p>
</div>
<!-- Enable downoad of results / convert to sif-xnl from here -->
Expand Down
Loading

0 comments on commit d6b2c35

Please sign in to comment.