merge

nsip · Apr 27, 2017 · c8e3c16 · c8e3c16
2 parents 38425c0 + 2f9be05
commit c8e3c16
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 26 deletions.
diff --git a/app/naprr/naprr.go b/app/naprr/naprr.go
@@ -2,11 +2,12 @@ package main
 
 import (
 	"flag"
-	"github.com/nats-io/nats-streaming-server/server"
-	"github.com/nsip/nias2/naprr"
 	"log"
 	"net"
 	"os"
+
+	"github.com/nats-io/nats-streaming-server/server"
+	"github.com/nsip/nias2/naprr"
 	// "os/exec"
 	// "os/signal"
 	"runtime"

diff --git a/app/naprr/public/js/naprr.js b/app/naprr/public/js/naprr.js
@@ -4,6 +4,7 @@ var participationData = [];
 var domainscoresData = [];
 var codeframeData = [];
 var schoolinfoData = {};
+var debug =true;
 
 var currentASLId;
 

diff --git a/app/naprr/public/js/naprr_graphs.js b/app/naprr/public/js/naprr_graphs.js
@@ -41,7 +41,7 @@ function createScoreSummaryGraph(ssdata)
     attributes['Value'] = +ssdata.Summ.DomainBottomNational60Percent;
     data.push(attributes);
 
-    console.log(data);
+    // console.log(data);
 
     var orderMeasures = [
         'Bottom National 60%',

diff --git a/app/naprr/public/js/naprr_schoolinfo.js b/app/naprr/public/js/naprr_schoolinfo.js
@@ -33,8 +33,6 @@ function createSchoolInfoReport()
 
     // console.log(schoolinfoData);
 
-    var contactInfo = schoolinfoData.SchoolContactList.SchoolContact[0].ContactInfo;
-
     $("#si-header").empty();
     $("#si-contact").empty();
     $("#si-establishment").empty();
@@ -43,19 +41,26 @@ function createSchoolInfoReport()
     $("#si-header").append("<h5 class=''>" +
         schoolinfoData.SchoolName + "</h5>");
 
-    $("#si-contact").append("<p>" + contactInfo.Address.Street.Line1 +
-        ", " + contactInfo.Address.City +
-        ", " + contactInfo.Address.StateProvince +
-        ", " + contactInfo.Address.PostalCode +
-        ".</p>");
+    var contactExists = schoolinfoData.SchoolContactList.SchoolContact !== null ? true : false
+    if (contactExists)
+    {
+        contactInfo = schoolinfoData.SchoolContactList.SchoolContact[0].ContactInfo;
+        $("#si-contact").append("<p>" + contactInfo.Address.Street.Line1 +
+            ", " + contactInfo.Address.City +
+            ", " + contactInfo.Address.StateProvince +
+            ", " + contactInfo.Address.PostalCode +
+            ".</p>");
 
-    $("#si-contact").append("<p>Principal: " + schoolinfoData.PrincipalInfo.ContactName.FullName +
-        ".</p>");
+        $("#si-contact").append("<p>Principal: " + schoolinfoData.PrincipalInfo.ContactName.FullName +
+            ".</p>");
+
+        $("#si-contact").append("<p>Contact: " + contactInfo.Name.FullName + "<br/>" +
+            "Phone: " + contactInfo.PhoneNumberList.PhoneNumber[0].Number +
+            " Ext.: " + contactInfo.PhoneNumberList.PhoneNumber[0].Extension +
+            ".</p>");
+
+    }
 
-    $("#si-contact").append("<p>Contact: " + contactInfo.Name.FullName + "<br/>" +
-        "Phone: " + contactInfo.PhoneNumberList.PhoneNumber[0].Number +
-        " Ext.: " + contactInfo.PhoneNumberList.PhoneNumber[0].Extension +
-        ".</p>");
 
     $("#si-establishment").append("<p>ACARA (ASL) Id:   " + schoolinfoData.ACARAId + "<br/>" +
         "Local Id:  " + schoolinfoData.LocalId + "<br/>" +
@@ -76,10 +81,13 @@ function createSchoolInfoReport()
         "LGA:  " + schoolinfoData.LocalGovernmentArea + "<br/>" +
         "Federal Electorate:  " + schoolinfoData.FederalElectorate + "<br/>" +
         "Religious Affiliation:  " + schoolinfoData.ReligiousAffiliation + "<br/>" +
-        "Geographic Location:  " + schoolinfoData.SchoolGeographicLocation + "<br/>" +
-        "Grid Location:  " + contactInfo.Address.GridLocation.Latitude +
-        ", " + contactInfo.Address.GridLocation.Longitude + "<br/>" +
-        ".</p>");
+        "Geographic Location:  " + schoolinfoData.SchoolGeographicLocation + "<br/></p>");
+
+    if (contactExists)
+    {
+        $("#si-extended").append("<p>Grid Location:  " + contactInfo.Address.GridLocation.Latitude +
+            ", " + contactInfo.Address.GridLocation.Longitude + "<br/></p>");
+    }
 
 
 

diff --git a/app/naprr/public/js/naprr_ui.js b/app/naprr/public/js/naprr_ui.js
@@ -156,6 +156,12 @@ function initSchoolChooserHandler()
             scoresummaryData = data;
             console.log("score summary data downloaded for " + acaraid +
                 " elements: " + scoresummaryData.length);
+
+            if (debug)
+            {
+                console.log(scoresummaryData);
+            }
+
             // display on screen while other reports download
             hideReport();
             createScoreSummaryReport();
@@ -169,6 +175,12 @@ function initSchoolChooserHandler()
             domainscoresData = data;
             console.log("domain scores data downloaded for " + acaraid +
                 " elements: " + domainscoresData.length);
+
+            if (debug)
+            {
+                console.log(domainscoresData);
+            }
+
         });
 
         $.get("/naprr/participation/" + acaraid, function(data, status)
@@ -177,6 +189,12 @@ function initSchoolChooserHandler()
             participationData = data;
             console.log("participation data downloaded for " + acaraid +
                 " elements: " + participationData.length);
+
+            if (debug)
+            {
+                console.log(participationData);
+            }
+
         });
 
         $.get("/naprr/schoolinfo/" + acaraid, function(data, status)
@@ -185,13 +203,25 @@ function initSchoolChooserHandler()
             schoolinfoData = data;
             console.log("school info data downloaded for " + acaraid);
 
+            if (debug)
+            {
+                console.log(schoolinfoData);
+            }
+
+
         });
 
         $.get("/naprr/codeframe", function(data, status)
         {
             codeframeData = {};
             codeframeData = data;
             console.log("codeframe data downloaded.");
+
+            if (debug)
+            {
+                console.log(codeframeData);
+            }
+
         });
 
     });

diff --git a/naprr/contractor_csvdata_ingest.go b/naprr/contractor_csvdata_ingest.go
@@ -3,15 +3,18 @@ package naprr
 import (
 	"bufio"
 	//ms "github.com/mitchellh/mapstructure"
-	"github.com/nats-io/nuid"
 	"strconv"
+
+	"github.com/nats-io/nuid"
 	//"github.com/nats-io/go-nats-streaming"
 	"fmt"
+	"log"
+	"path/filepath"
+
 	"github.com/nsip/nias2/lib"
 	nxml "github.com/nsip/nias2/xml"
 	"github.com/twinj/uuid"
-	"log"
-	"path/filepath"
+
 	//"sync"
 	"github.com/wildducktheories/go-csv"
 	"os"

diff --git a/naprr/naprr_webserver.go b/naprr/naprr_webserver.go
@@ -123,7 +123,7 @@ func (rrs *ResultsReportingServer) Run() {
 	//
 	e.GET("/naprr/codeframe", func(c echo.Context) error {
 
-		cfds := rrs.sr.GetCodeFrameData("report.cframe")
+		cfds := rrs.sr.GetCodeFrameData(REPORTS_CODEFRAME)
 
 		return c.JSON(http.StatusAccepted, cfds)
 	})

diff --git a/naprr/reportgenerator.go b/naprr/reportgenerator.go
@@ -2,9 +2,10 @@
 package naprr
 
 import (
+	"log"
+
 	"github.com/nats-io/go-nats-streaming"
 	"github.com/nsip/nias2/lib"
-	"log"
 )
 
 type ReportGenerator struct {
@@ -238,6 +239,7 @@ func (rg *ReportGenerator) GenerateParticipationData(nd *NAPLANData, sd *SchoolD
 		for _, ei := range pds.EventInfos {
 			pds.Summary[ei.Test.TestContent.TestDomain] = ei.Event.ParticipationCode
 		}
+
 		payload, err := rg.ge.Encode(pds)
 		if err != nil {
 			log.Println("unable to encode pds: ", err)

diff --git a/naprr/reportwriter.go b/naprr/reportwriter.go
@@ -33,7 +33,6 @@ func (rw *ReportWriter) Run() {
 	rw.writeSchoolLevelReports(schools)
 	rw.writeAggregateSchoolReports(schools)
 	rw.writeTestLevelReports()
-	//rw.writeYr3WReports()
 
 	log.Println("All reports written\n")
 }