From 2187506d75cafdb73e33764daa7937d38355c123 Mon Sep 17 00:00:00 2001 From: Edouard Date: Tue, 21 Oct 2014 11:48:33 +0300 Subject: [PATCH 1/8] Update index.html Changed the spreadhseet --- index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 91ecedb..3f5d147 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,6 @@ - @@ -58,7 +57,7 @@

Iraq Supply Pipeline

-
Click on any of those graphs below to filter and slice the data. More Information on Iraq here.
+
Click on any of those graphs below to filter and slice the data.
Reset All
@@ -122,7 +121,7 @@

Iraq Supply Pipeline

var ds = new Miso.Dataset({ importer : Miso.Dataset.Importers.GoogleSpreadsheet, parser : Miso.Dataset.Parsers.GoogleSpreadsheet, - key : "12dxOiV7n0r0ANNaAvrXPuJRxS9h8lhGgb7DVVMgh8gA", + key : "1dqTTsaSTST8LgYGShZ4ZtOKx8-fCZqQI5SW1jBRbH6Q", worksheet : "1" }); From 5ecbf11b80863b1acf9c8553e526280d5128f038 Mon Sep 17 00:00:00 2001 From: edouard-legoupil Date: Tue, 21 Oct 2014 13:17:26 +0300 Subject: [PATCH 2/8] change --- images/favicon.ico | Bin 318 -> 23558 bytes images/logo.png | Bin 0 -> 11196 bytes index.html | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 images/logo.png diff --git a/images/favicon.ico b/images/favicon.ico index a12c0535fa259088fbd87961f570eb3fe40ee2d4..eea6dfe8c0c4db8b9e6669d2ef96b78fb80a89b9 100644 GIT binary patch literal 23558 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 JEEP8l_+K`C3QPb1 literal 0 HcmV?d00001 diff --git a/index.html b/index.html index 3f5d147..5fa7a5e 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,7 @@
- +
@@ -57,7 +57,9 @@

Iraq Supply Pipeline

-
Click on any of those graphs below to filter and slice the data.
+ +
Click on any of those graphs below to filter and slice the data. .
+
Reset All
From 2963fe5c37b1643fb8cf680742d5e83baacabcca Mon Sep 17 00:00:00 2001 From: edouard-legoupil Date: Wed, 22 Oct 2014 14:01:41 +0300 Subject: [PATCH 3/8] rev --- index.html | 166 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 72 deletions(-) diff --git a/index.html b/index.html index 5fa7a5e..748e01a 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,6 @@
-
@@ -55,49 +54,57 @@ -
-

Iraq Supply Pipeline

+
+
+ +
+

Iraq Supply Pipeline

+
Click on any of the graphs below to filter and slice the data.
+
-
Click on any of those graphs below to filter and slice the data. .
+
+ +
Reset All
Tutorial
- +
-
NFI Values by Item Group (USD)
-
NFI Quantities
-
NFI Value by Status (USD)
- - + +
+
NFI Quantities by item type +
+ +
+
NFI quantity by organisation
+
-
NFI Value by Target Population (USD)
-
NFI Value by Operation (USD)
- -
- - - - - - - -
Supply Timeline
-
-


-
- -
- -
- +
+
NFI type by Category (number of Item) +
+ +
+
NFI Quantity by Operational area +
+ +
+
Supply Timeline
+
+
@@ -112,7 +119,7 @@

Iraq Supply Pipeline

}); //declaration of chart names and types - var value_chart = dc.rowChart("#item_value"); + // var value_chart = dc.rowChart("#item_value"); var proc_total_status_chart = dc.pieChart("#proc_total_status"); var proc_total_target_chart = dc.rowChart("#proc_total_target"); var proc_total_op = dc.rowChart("#proc_total_op"); @@ -145,7 +152,7 @@

Iraq Supply Pipeline

//formatting of numbers, dates var numberFormat = d3.format(",f"); - var dateFormat = d3.time.format("%Y-%m-%d"); + var dateFormat = d3.time.format("%Y-%d-%m"); var monthNameFormat = d3.time.format("%B"); //crossfilter data var cf = crossfilter(spreadsheetdata); @@ -154,9 +161,11 @@

Iraq Supply Pipeline

cf.targetpop = cf.dimension(function (d) { return d.Target_Population; }); + cf.op = cf.dimension(function (d) { return d.Operation; }); + cf.item = cf.dimension(function (d) { return d.Item; }); @@ -164,11 +173,12 @@

Iraq Supply Pipeline

cf.status = cf.dimension(function (d) { return d.Status; }); + cf.location = cf.dimension(function (d) { return d.Location; }); -//gruop by dimensions +//group by dimensions var targetpop = cf.targetpop.group(); var op = cf.op.group(); // var date = cf.date.group(); @@ -227,7 +237,7 @@

Iraq Supply Pipeline

// Serializing filters values in URL function getFiltersValues() { var filters = [ - { name: 'value', value: value_chart.filters()}, + // { name: 'value', value: value_chart.filters()}, { name: 'proc', value: proc_total_status_chart.filters()}, { name: 'proc2', value: proc_total_target_chart.filters()}, { name: 'itm_qty', value: itm_qty_chart.filters()}, @@ -293,8 +303,11 @@

Iraq Supply Pipeline

return "" + monthNameFormat(d.key) + " : " + numberFormat(d.value) + " USD"; }); -// Item value chart - value_chart.width(400).height(485) + // Item value chart + /* + value_chart + .width(400) + .height(485) .dimension(cf.item) .group(item_total_value = item_total_value || 0) .elasticX(true) @@ -302,9 +315,24 @@

Iraq Supply Pipeline

.renderTitle(false) .on("filtered", getFiltersValues) .xAxis().ticks(6).tickFormat(d3.format("$,s")); + */ + + // Item quantity chart + itm_qty_chart + .width(400) + .height(600) + .dimension(cf.item) + .on("filtered", getFiltersValues) + .group(item_total_quantity = item_total_quantity || 0) + .elasticX(true) + .renderTitle(false) + .renderLabel(true) + .xAxis().ticks(6).tickFormat(d3.format("s")); -// Status chart - proc_total_status_chart.width(300).height(200) + // Status chart + proc_total_status_chart + .width(300) + .height(200) .dimension(cf.status) .group(status_by_total = status_by_total || 0) .radius(100) @@ -316,79 +344,70 @@

Iraq Supply Pipeline

.renderTitle(false) .on("filtered", getFiltersValues); -// Target population chart - proc_total_target_chart.width(300).height(120) + // Target population chart + proc_total_target_chart + .width(300) + .height(100) .dimension(cf.targetpop) .group(targetpop_by_total = targetpop_by_total || 0) .elasticX(false) .renderLabel(true) .renderTitle(false) .on("filtered", getFiltersValues) - .xAxis().ticks(4).tickFormat(d3.format("$,s")); + .xAxis().ticks(4).tickFormat(d3.format(",s")); -// Operation chart - proc_total_op.width(300).height(90) + // Operation chart + proc_total_op + .width(300) + .height(120) .dimension(cf.op) .group(op_by_total = op_by_total || 0) .elasticX(false) .renderLabel(true) .renderTitle(false) .on("filtered", getFiltersValues) - .xAxis().ticks(4).tickFormat(d3.format("$,s")); + .xAxis().ticks(4).tickFormat(d3.format(",s")); -// Item quantity chart - itm_qty_chart.width(400).height(485) - .dimension(cf.item) - .on("filtered", getFiltersValues) - .group(item_total_quantity = item_total_quantity || 0) - .elasticX(true) - .renderTitle(false) - .renderLabel(true) - .xAxis().ticks(6).tickFormat(d3.format("s")); - -// Timeline bar chart + // Timeline bar chart proc_trend_chart - .height(300) - .width(600) + .height(250) + .width(750) .renderHorizontalGridLines(true) .dimension(datedimension) .group(value_by_date) // .renderTitle(true) .title(function (d) { return monthNameFormat(d.key) + ": " + numberFormat(d.value); }) -// define scale based on minimum and maximum dates + // define scale based on minimum and maximum dates .x(d3.time.scale().domain([minDate,maxDate])) .xUnits(d3.time.months) .on("filtered", getFiltersValues) .brushOn(true) // .gap(10) .elasticY(false) - -// rotate and move X axis labels + // rotate and move X axis labels .renderlet(function (chart) { chart.selectAll("g.x text") .attr('dx', '-30') .attr('transform', "rotate(-45)"); }) .margins({left: 70 ,top: 10, bottom: 50, right: 50}) - .yAxis().ticks(7).tickFormat(d3.format("$,s")); - + .yAxis().ticks(7).tickFormat(d3.format(",s")); //Map //Import admin level 1 geojson + /* d3.json("data/admin1.geojson", function(json) { -// extend admin level 1 map geojson features with values, paired by location code that appears on both the map and the dataset + // extend admin level 1 map geojson features with values, + //paired by location code that appears on both the map and the dataset for (var i = 0; i < Location_json.length; i++) { var dist_Location = Location_json[i].A1Code; var dist_Value = parseFloat(Location_json[i].Value); - for (var j = 0; j < json.features.length; j++) { var jsonGov = json.features[j].properties.A1Code; - if (dist_Location == jsonGov) { json.features[j].properties.Value = dist_Value; break; - } } } @@ -488,7 +507,7 @@

Iraq Supply Pipeline

onEachFeature: onEachFeature }).addTo(map); -// legend control (not used) + // legend control (not used) var legend = L.control({position: 'bottomleft'}); legend.onAdd = function (map) { @@ -512,6 +531,7 @@

Iraq Supply Pipeline

}; //legend.addTo(map); }); + */ initFilters(); @@ -534,11 +554,13 @@

Iraq Supply Pipeline

}); - - + + + -