diff --git a/assets/data/dss/metrics_by_department.csv b/assets/data/dss/metrics_by_department.csv index a7326738..77c142fd 100644 --- a/assets/data/dss/metrics_by_department.csv +++ b/assets/data/dss/metrics_by_department.csv @@ -91,4 +91,4 @@ FY24,Other,3 FY24,Psychology,25 FY24,SEAS,2 FY24,Sociology,9 -FY24,WCFIA,1 +FY24,WCFIA,1 \ No newline at end of file diff --git a/assets/data/dss/metrics_by_department_cumulative.csv b/assets/data/dss/metrics_by_department_cumulative.csv index fb86d6ed..d04f9e10 100644 --- a/assets/data/dss/metrics_by_department_cumulative.csv +++ b/assets/data/dss/metrics_by_department_cumulative.csv @@ -124,4 +124,4 @@ HMS,FY24_Q4,5,54 HSPH,FY24_Q4,11,168 MIT,FY24_Q4,10,101 Psychology,FY24_Q4,3,66 -Sociology,FY24_Q4,2,61 +Sociology,FY24_Q4,2,61 \ No newline at end of file diff --git a/assets/data/dss/metrics_by_quarter.csv b/assets/data/dss/metrics_by_quarter.csv index 62213080..626fcd21 100644 --- a/assets/data/dss/metrics_by_quarter.csv +++ b/assets/data/dss/metrics_by_quarter.csv @@ -14,4 +14,4 @@ FY23,FY23_Q4,64 FY24,FY24_Q1,69 FY24,FY24_Q2,58 FY24,FY24_Q3,81 -FY24,FY24_Q4,48 +FY24,FY24_Q4,48 \ No newline at end of file diff --git a/assets/js/dss_plots.js b/assets/js/dss_plots.js index ba504b4c..8baec6a7 100644 --- a/assets/js/dss_plots.js +++ b/assets/js/dss_plots.js @@ -28,7 +28,6 @@ function colorMemo(financial_year) { function dssOverview() { d3.tsv(path + "overview.tsv", function (error, data) { - console.log(error); for (d of data) { dssAddMetric(d, "dssOverview", "col-sm-6 col-xs-12 col-md-6 col-lg-4 col-xl-3") } @@ -76,7 +75,7 @@ function year_quarter() { "value": "unique_tickets", "label": "Number of Help requests" }) - .color((d) => { return colorMemo(d.fyear_quarter) } ) + .color((d) => { return colorMemo(d.financial_year) } ) .font({ "family": fontFamily }) @@ -115,7 +114,7 @@ function timeSeriesCommunity() { "value": "cumulative_tickets", "label": "Cumulative Requests" }) - .legend(false) + .legend(true) .font({ "family": fontFamily }) @@ -144,7 +143,7 @@ function patron_community() { .container("." + div) .data(myNumData) .type("bar") - .id(["patron_community", "financial_year"]) + .id(["financial_year","patron_community"]) .y({ "value": "patron_community", "scale": "discrete", @@ -155,11 +154,10 @@ function patron_community() { "label": "Number of Help Requests", }) .order({ - "sort": "asc", - "value": "unique_tickets" + "sort": "desc", + "value": "financial_year", }) - .legend(false) - .color((d) => iqss_color_pallette[Math.floor(Math.random() * iqss_color_pallette.length)]) // iqss_color_pallette[Math.floor(Math.random() * iqss_color_pallette.length)])) + .color((d) => colorMemo(d.financial_year)) .font({ "family": fontFamily, "transform": "none" @@ -188,7 +186,7 @@ function request_type() { .container("." + div) .data(myNumData) .type("bar") - .id(["request_type","financial_year"]) + .id(["financial_year", "request_type"]) .x({ "value": "total_count", "label": "Number of Help Requests" @@ -202,12 +200,12 @@ function request_type() { "sort": "asc", "value": "total_count" }) - .color((d) => { return Array.isArray(d.financialYearColor) ? d.financialYearColor.at(-1) : d.financialYearColor }) + .color((d) => colorMemo(d.financial_year)) .font({ "family": fontFamily, "transform": "none" }) - .legend(false) + .legend(true) .resize(true) .draw() }); diff --git a/data-science-services.html b/data-science-services.html index 23caf82b..50675598 100644 --- a/data-science-services.html +++ b/data-science-services.html @@ -4,17 +4,17 @@ --- {% include templates.html %} -