This repository has been archived by the owner on May 11, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- [x] Add an ‘All Years’ option to the year filter - [x] in blue box below, 'How the data is calculated' box lists dates as 2015. Update the text to current year. - [x] Carry the filter over when a user clicks on the ‘Projects’, ‘total budget’, or ‘total expenditure’ box. - [x] Increase size of font of ‘About this data’ and ‘About data quality’
- Loading branch information
1 parent
49a2a55
commit bb9cf39
Showing
15 changed files
with
169 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,97 +1,101 @@ | ||
| // Copyright (c) 2014 International Aid Transparency Initiative (IATI) | ||
| // Licensed under the MIT license whose full text can be found at http://opensource.org/licenses/MIT | ||
|
|
||
| var view_sectors_top = exports; | ||
| exports.name = "view_sectors_top"; | ||
|
|
||
| var view_sectors_top=exports; | ||
| exports.name="view_sectors_top"; | ||
| var ctrack = require("./ctrack.js"); | ||
| var plate = require("./plate.js"); | ||
| var iati = require("./iati.js"); | ||
| var fetch = require("./fetch.js"); | ||
|
|
||
| var ctrack=require("./ctrack.js") | ||
| var plate=require("./plate.js") | ||
| var iati=require("./iati.js") | ||
| var fetch=require("./fetch.js") | ||
| var refry = require("../../dstore/js/refry.js"); | ||
| var iati_codes = require("../../dstore/json/iati_codes.json"); | ||
| var crs_year_sectors = require("../../dstore/json/crs_2013_sectors.json"); | ||
|
|
||
| var refry=require("../../dstore/js/refry.js") | ||
| var iati_codes=require("../../dstore/json/iati_codes.json") | ||
| var crs_year_sectors=require("../../dstore/json/crs_2013_sectors.json") | ||
|
|
||
| var commafy=function(s) { return (""+s).replace(/(^|[^\w.])(\d{4,})/g, function($0, $1, $2) { | ||
| return $1 + $2.replace(/\d(?=(?:\d\d\d)+(?!\d))/g, "$&,"); }) }; | ||
| var commafy = function(s) { | ||
| return ("" + s).replace(/(^|[^\w.])(\d{4,})/g, function($0, $1, $2) { | ||
| return $1 + $2.replace(/\d(?=(?:\d\d\d)+(?!\d))/g, "$&,"); | ||
| }); | ||
| }; | ||
|
|
||
| // the chunk names this view will fill with new data | ||
| view_sectors_top.chunks=[ | ||
| ]; | ||
|
|
||
| view_sectors_top.chunks = []; | ||
|
|
||
| // | ||
| // Perform fake ajax call to get data | ||
| // | ||
| view_sectors_top.ajax=function(args) | ||
| { | ||
| args=args || {}; | ||
| var limit=args.limit || 5; | ||
| var year=args.year || parseInt(ctrack.hash.year) || ctrack.year; | ||
| ctrack.year_chunks(year); | ||
|
|
||
| var list=[]; | ||
| view_sectors_top.ajax = function(args) { | ||
| args = args || {}; | ||
| var limit = args.limit || 5; | ||
| var year = args.year || parseInt(ctrack.hash.year) || ctrack.year; | ||
| ctrack.year_chunks(year); | ||
|
|
||
| var list = []; | ||
|
|
||
| var dat={ | ||
| "from":"act,trans,country,sector", | ||
| "limit":-1, | ||
| "select":"sector_group,sector_code,"+ctrack.convert_str("sum_of_percent_of_trans"), | ||
| "sector_group_not_null":1, | ||
| "groupby":"sector_group", | ||
| "trans_code":"D|E", | ||
| "trans_day_gteq":year+"-"+ctrack.args.newyear,"trans_day_lt":(parseInt(year)+1)+"-"+ctrack.args.newyear, | ||
| }; | ||
| fetch.ajax_dat_fix(dat,args); | ||
| var dat = { | ||
| from: "act,trans,country,sector", | ||
| limit: -1, | ||
| select: | ||
| "sector_group,sector_code," + | ||
| ctrack.convert_str("sum_of_percent_of_trans"), | ||
| sector_group_not_null: 1, | ||
| groupby: "sector_group", | ||
| trans_code: "D|E" | ||
| }; | ||
|
|
||
| if(!dat.reporting_ref){dat.flags=0;} | ||
| var callback=function(data){ | ||
| for(var i=0;i<data.rows.length;i++) | ||
| { | ||
| var v=data.rows[i]; | ||
| if(iati_codes.sector[v.sector_code]){ | ||
| var d = {}; | ||
| d.sector_group = iati_codes.sector_names[v.sector_group]; | ||
| d.sector_name = iati_codes.sector[v.sector_code]; | ||
| d.usd = Math.floor(ctrack.convert_num("sum_of_percent_of_trans", v)); | ||
| list.push(d); | ||
| } | ||
| } | ||
| list.sort(function(a,b){ | ||
| return ( (b.usd||0)-(a.usd||0) ); | ||
| }); | ||
| if (year !== "all years") { | ||
| dat.trans_day_gteq = year + "-" + ctrack.args.newyear; | ||
| dat.trans_day_lt = parseInt(year) + 1 + "-" + ctrack.args.newyear; | ||
| } | ||
|
|
||
| var total=0; list.forEach(function(it){ | ||
| if(it.usd>0) | ||
| { | ||
| total+=it.usd; | ||
| } | ||
| else | ||
| { | ||
| total-=it.usd; | ||
| } | ||
| }); | ||
| var shown=0; | ||
| var dd=[]; | ||
| list.forEach(function(v){ | ||
| var d = {}; | ||
| d.num = v.usd; | ||
| var initialPct = 100*d.num/total; | ||
| if(initialPct < 1){ | ||
| d.pct = "<1"; | ||
| } | ||
| else{ | ||
| d.pct=Math.round(initialPct); | ||
| } | ||
| if(d.num < 0){d.num = -d.num; } | ||
| d.str_lab = v.sector_name; | ||
| dd.push(d); | ||
| }); | ||
| ctrack.chunk("data_chart_sectors",dd); | ||
| ctrack.display(); | ||
| fetch.ajax_dat_fix(dat, args); | ||
|
|
||
| }; | ||
| fetch.ajax(dat,callback); | ||
| if (!dat.reporting_ref) { | ||
| dat.flags = 0; | ||
| } | ||
| var callback = function(data) { | ||
| for (var i = 0; i < data.rows.length; i++) { | ||
| var v = data.rows[i]; | ||
| if (iati_codes.sector[v.sector_code]) { | ||
| var d = {}; | ||
| d.sector_group = iati_codes.sector_names[v.sector_group]; | ||
| d.sector_name = iati_codes.sector[v.sector_code]; | ||
| d.usd = Math.floor(ctrack.convert_num("sum_of_percent_of_trans", v)); | ||
| list.push(d); | ||
| } | ||
| } | ||
| list.sort(function(a, b) { | ||
| return (b.usd || 0) - (a.usd || 0); | ||
| }); | ||
|
|
||
| } | ||
| var total = 0; | ||
| list.forEach(function(it) { | ||
| if (it.usd > 0) { | ||
| total += it.usd; | ||
| } else { | ||
| total -= it.usd; | ||
| } | ||
| }); | ||
| var shown = 0; | ||
| var dd = []; | ||
| list.forEach(function(v) { | ||
| var d = {}; | ||
| d.num = v.usd; | ||
| var initialPct = 100 * d.num / total; | ||
| if (initialPct < 1) { | ||
| d.pct = "<1"; | ||
| } else { | ||
| d.pct = Math.round(initialPct); | ||
| } | ||
| if (d.num < 0) { | ||
| d.num = -d.num; | ||
| } | ||
| d.str_lab = v.sector_name; | ||
| dd.push(d); | ||
| }); | ||
| ctrack.chunk("data_chart_sectors", dd); | ||
| ctrack.display(); | ||
| }; | ||
| fetch.ajax(dat, callback); | ||
| }; |
Oops, something went wrong.