Merge pull request #74 from okfde/64-zivile-friedensfoerderung

64 zivile friedensfoerderung

source/data/security/friedensfoerderung/zivile.csv

@@ -0,0 +1,235 @@
+"","Country","year","value"
+"1","Australia","2004",12
+"2","Austria","2004",18
+"3","Belgium","2004",26
+"4","Canada","2004",58
+"5","Czech Republic","2004",0
+"6","Denmark","2004",1
+"7","Finland","2004",11
+"8","France","2004",9
+"9","Germany","2004",74
+"10","Greece","2004",2
+"11","Iceland","2004",0
+"12","Ireland","2004",3
+"13","Italy","2004",7
+"14","Japan","2004",16
+"15","Korea","2004",0
+"16","Luxembourg","2004",0
+"17","Netherlands","2004",70
+"18","New Zealand","2004",3
+"19","Norway","2004",66
+"20","Portugal","2004",16
+"21","Slovenia","2004",0
+"22","Spain","2004",25
+"23","Sweden","2004",12
+"24","Switzerland","2004",25
+"25","United Kingdom","2004",12
+"26","United States","2004",871
+"27","Australia","2005",31
+"28","Austria","2005",23
+"29","Belgium","2005",14
+"30","Canada","2005",58
+"31","Czech Republic","2005",0
+"32","Denmark","2005",8
+"33","Finland","2005",28
+"34","France","2005",8
+"35","Germany","2005",117
+"36","Greece","2005",35
+"37","Iceland","2005",0
+"38","Ireland","2005",4
+"39","Italy","2005",10
+"40","Japan","2005",8
+"41","Korea","2005",0
+"42","Luxembourg","2005",0
+"43","Netherlands","2005",81
+"44","New Zealand","2005",1
+"45","Norway","2005",72
+"46","Portugal","2005",16
+"47","Slovenia","2005",0
+"48","Spain","2005",20
+"49","Sweden","2005",42
+"50","Switzerland","2005",65
+"51","United Kingdom","2005",15
+"52","United States","2005",793
+"53","Australia","2006",77
+"54","Austria","2006",24
+"55","Belgium","2006",16
+"56","Canada","2006",46
+"57","Czech Republic","2006",0
+"58","Denmark","2006",11
+"59","Finland","2006",32
+"60","France","2006",13
+"61","Germany","2006",107
+"62","Greece","2006",38
+"63","Iceland","2006",0
+"64","Ireland","2006",4
+"65","Italy","2006",2
+"66","Japan","2006",71
+"67","Korea","2006",3
+"68","Luxembourg","2006",1
+"69","Netherlands","2006",178
+"70","New Zealand","2006",4
+"71","Norway","2006",182
+"72","Portugal","2006",36
+"73","Slovenia","2006",0
+"74","Spain","2006",22
+"75","Sweden","2006",63
+"76","Switzerland","2006",64
+"77","United Kingdom","2006",10
+"78","United States","2006",597
+"79","Australia","2007",78
+"80","Austria","2007",7
+"81","Belgium","2007",23
+"82","Canada","2007",33
+"83","Czech Republic","2007",0
+"84","Denmark","2007",30
+"85","Finland","2007",21
+"86","France","2007",28
+"87","Germany","2007",161
+"88","Greece","2007",52
+"89","Iceland","2007",0
+"90","Ireland","2007",11
+"91","Italy","2007",13
+"92","Japan","2007",40
+"93","Korea","2007",0
+"94","Luxembourg","2007",3
+"95","Netherlands","2007",134
+"96","New Zealand","2007",16
+"97","Norway","2007",202
+"98","Portugal","2007",71
+"99","Slovenia","2007",0
+"100","Spain","2007",148
+"101","Sweden","2007",120
+"102","Switzerland","2007",65
+"103","United Kingdom","2007",222
+"104","United States","2007",1024
+"105","Australia","2008",59
+"106","Austria","2008",25
+"107","Belgium","2008",37
+"108","Canada","2008",214
+"109","Czech Republic","2008",0
+"110","Denmark","2008",31
+"111","Finland","2008",38
+"112","France","2008",45
+"113","Germany","2008",283
+"114","Greece","2008",41
+"115","Iceland","2008",0
+"116","Ireland","2008",16
+"117","Italy","2008",23
+"118","Japan","2008",68
+"119","Korea","2008",2
+"120","Luxembourg","2008",1
+"121","Netherlands","2008",354
+"122","New Zealand","2008",10
+"123","Norway","2008",243
+"124","Portugal","2008",70
+"125","Slovenia","2008",0
+"126","Spain","2008",48
+"127","Sweden","2008",144
+"128","Switzerland","2008",90
+"129","United Kingdom","2008",293
+"130","United States","2008",896
+"131","Australia","2009",42
+"132","Austria","2009",21
+"133","Belgium","2009",32
+"134","Canada","2009",164
+"135","Czech Republic","2009",0
+"136","Denmark","2009",71
+"137","Finland","2009",68
+"138","France","2009",52
+"139","Germany","2009",400
+"140","Greece","2009",43
+"141","Iceland","2009",0
+"142","Ireland","2009",13
+"143","Italy","2009",8
+"144","Japan","2009",96
+"145","Korea","2009",2
+"146","Luxembourg","2009",2
+"147","Netherlands","2009",168
+"148","New Zealand","2009",7
+"149","Norway","2009",244
+"150","Portugal","2009",59
+"151","Slovenia","2009",0
+"152","Spain","2009",42
+"153","Sweden","2009",145
+"154","Switzerland","2009",74
+"155","United Kingdom","2009",537
+"156","United States","2009",893
+"157","Australia","2010",66
+"158","Austria","2010",21
+"159","Belgium","2010",26
+"160","Canada","2010",159
+"161","Czech Republic","2010",0
+"162","Denmark","2010",49
+"163","Finland","2010",65
+"164","France","2010",59
+"165","Germany","2010",380
+"166","Greece","2010",0
+"167","Iceland","2010",0
+"168","Ireland","2010",12
+"169","Italy","2010",10
+"170","Japan","2010",381
+"171","Korea","2010",84
+"172","Luxembourg","2010",3
+"173","Netherlands","2010",113
+"174","New Zealand","2010",10
+"175","Norway","2010",216
+"176","Portugal","2010",48
+"177","Slovenia","2010",2
+"178","Spain","2010",35
+"179","Sweden","2010",158
+"180","Switzerland","2010",80
+"181","United Kingdom","2010",230
+"182","United States","2010",799
+"183","Australia","2011",109
+"184","Austria","2011",10
+"185","Belgium","2011",29
+"186","Canada","2011",137
+"187","Czech Republic","2011",6
+"188","Denmark","2011",49
+"189","Finland","2011",59
+"190","France","2011",63
+"191","Germany","2011",361
+"192","Greece","2011",1
+"193","Iceland","2011",1
+"194","Ireland","2011",10
+"195","Italy","2011",5
+"196","Japan","2011",109
+"197","Korea","2011",2
+"198","Luxembourg","2011",1
+"199","Netherlands","2011",148
+"200","New Zealand","2011",17
+"201","Norway","2011",248
+"202","Portugal","2011",13
+"203","Slovenia","2011",2
+"204","Spain","2011",72
+"205","Sweden","2011",134
+"206","Switzerland","2011",108
+"207","United Kingdom","2011",257
+"208","United States","2011",603
+"209","Australia","2012",71
+"210","Austria","2012",11
+"211","Belgium","2012",12
+"212","Canada","2012",86
+"213","Czech Republic","2012",10
+"214","Denmark","2012",43
+"215","Finland","2012",46
+"216","France","2012",35
+"217","Germany","2012",294
+"218","Greece","2012",1
+"219","Iceland","2012",1
+"220","Ireland","2012",9
+"221","Italy","2012",2
+"222","Japan","2012",100
+"223","Korea","2012",2
+"224","Luxembourg","2012",1
+"225","Netherlands","2012",430
+"226","New Zealand","2012",13
+"227","Norway","2012",276
+"228","Portugal","2012",10
+"229","Slovenia","2012",2
+"230","Spain","2012",35
+"231","Sweden","2012",189
+"232","Switzerland","2012",114
+"233","United Kingdom","2012",241
+"234","United States","2012",737

source/javascripts/zivile-friedensf.coffee

@@ -0,0 +1,47 @@
+class ZivileFriedensfoerderung extends @D3Linechart
+  constructor: (@rawData, @options = {}) ->
+    @options = _.defaults(@options, { width: 800, height: 300, margin: {top: 40, right: 80, bottom: 50, left: 80}, ticks: { y: 7, x: 8 } })
+
+  lineClassForElement:  (d) ->
+    d[0].Country.toLowerCase()
+
+  setScalesAndDomain: (data)->
+    @setDataKey('value')
+    @setDateKey('year')
+    @setYDomain([0, d3.max(data, (d) ->
+      d3.max(d, (d) ->
+        parseInt(d.value)
+      )
+    )])
+    @setXDomain(d3.extent(data[0], (d) => @parseDateFromYear(d.year)))
+    @
+
+  drawPersonal: (countries = []) ->
+    @data = _.filter(@rawData, (d) -> _.contains(countries, d.Country))
+    @data = _.groupBy(@data, (d) -> d.Country)
+    @data = _.map(@data, (data) =>
+      _.sortBy(data, (d) => @parseDateFromYear(d.year))
+    )
+    @setScalesAndDomain(@data)
+    @data.forEach((d) => d.forEach((d) => d.year = @parseDateFromYear(d.year)))
+
+  dataFormat: ->
+    d3.numberFormat(",.")
+
+  mouseout: (d) =>
+    d3.select(".#{d.Country.toLowerCase()} path").classed("country-hover", false)
+    @focus.attr("transform", "translate(-100,-100)")
+
+  mouseover: (d) =>
+    d3.select(".#{d.Country.toLowerCase()} path").classed("country-hover", true)
+    @focus.attr("transform", "translate(#{@xScale(d[@dateKey])},#{@yScale(d[@dataKey])})")
+    @focus.select("text").text("#{d.Country}: $#{@dataFormat()(d[@dataKey])} Mio")
+$ ->
+  if $('#friedensfoerderung .zivile').length > 0
+    zivilePath = "#{rootPath}/data/security/friedensfoerderung/zivile.csv"
+    d3.csv zivilePath, (data) ->
+      countries = ['Austria', 'United States', 'Germany', 'United Kingdom', 'Norway']
+      personal = new ZivileFriedensfoerderung(data)
+      personal.setLineClass('countries')
+      personal.drawPersonal(countries)
+      personal.render('#friedensfoerderung .zivile')

source/sicherheit/friedensfoerderung/index.html.haml

@@ -0,0 +1,18 @@
+---
+title: Entwicklungsbarometer - Zivile Friedensförderung
+---
+#sicherheit.indikator.sub-indikator
+  = link_to "/sicherheit/index.html" do
+    %h1.sicherheit Sicherheit
+  #friedensfoerderung
+    .navbar
+      %ul.nav
+        %li.active
+          = link_to "/sicherheit/peacekeeping/" do
+            %h4 Friedensförderung in der Entwicklungszusammenarbeit
+    .zivile.linegraph
+
+    %h2 Friedensförderung in der Entwicklungszusammenarbeit
+    .explanation
+      %p Kriege und militärische Konflikte gehen einher mit hohen Kosten für die kriegsführenden Parteien aber vor allem auch für Zivilisten in den betroffenen Gebieten. Allein aus Effizienzgründen ist es daher wünschenswert, Konflikte zu lösen, bevor es zu Gewaltausbrüchen und militärischen Auseinandersetzungen kommt. Das diplomatische Engagements Deutschlands für die Beilegung von Konflikten ist quantitativ schwer meßbar. Ein Indikator für die Priorisierung ziviler Konfliktlösung ist jedoch die Finanzierung von Programmen der zivilen Konfliktbewältigung im Rahmen der Entwicklungszusammenarbeit. Diese Visualisierung stellt die Höhe der Ausgaben für zivile Konfliktbewältigung in den vergangenen Jahren dar. 
+      %p Die Daten stammen aus dem Creditor Reporting System, der Datenbank des OECD Development Assistance Committee (DAC). Sie werden jährlich von den OECD Mitgliedsländern aktualisiert.

source/sicherheit/index.html.haml

@@ -18,11 +18,11 @@ block: "sicherheit"
         = link_to "/sicherheit/peacekeeping/index.html" do
           %h5 Militärausgaben für UN mandantierte Peacekeeping Einsätze
       %li
-        %a
-          %h5 Transparenz des Waffenexports
+        = link_to "/sicherheit/friedensfoerderung/index.html" do
+          %h5 Zivile Friedensförderung
       %li
         %a
-          %h5 Finanzierung von Abrüstung, Rüstungskontrollle und friedlicher Konfliklösung
+          %h5 Transparenz des Waffenexports
   .cdi
     #cdi-index
       .cdi-index-sicherheit

source/sicherheit/peacekeeping/index.html.haml

@@ -7,7 +7,7 @@ nav: index
     %h1.sicherheit Sicherheit
   #peacekeeping
     = partial "partials/peacekeeping_nav"
-    .contributions
+    .contributions.linegraph
     %h2 Finanzbeiträge für UN Peacebuilding
     .explanation
       %p Dieser Indikator ist vom CDI übernommen und misst den geschätzten finanziellen Aufwand eines OECD Landes für die Entsendung von Personal in UN Peacebuilding Einsätzen. Vor dem Hintergrund der deutschen Geschichte wird die Beteiligung deutscher Soldaten an militärischen Einsätzen im Ausland kontrovers diskutiert. Es verwundert daher nicht, dass andere OECD Länder im Vergleich zu Deutschland mehr Personal für UN Peacebuilding bereitstellen.

source/sicherheit/peacekeeping/personal.html.haml

@@ -7,7 +7,7 @@ nav: personal
     %h1.sicherheit Sicherheit
   #peacekeeping
     = partial "partials/peacekeeping_nav"
-    #personal
+    #personal.linegraph
     %h2 Gesamtbeiträge für UN Peacebuilding
     .explanation
       %p Dieser Indikator ist vom CDI übernommen und misst den geschätzten finanziellen Aufwand eines OECD Landes für die Entsendung von Personal in UN Peacebuilding Einsätzen. Vor dem Hintergrund der deutschen Geschichte wird die Beteiligung deutscher Soldaten an militärischen Einsätzen im Ausland kontrovers diskutiert. Es verwundert daher nicht, dass andere OECD Länder im Vergleich zu Deutschland mehr Personal für UN Peacebuilding bereitstellen.

source/stylesheets/pages/_sicherheit.sass

@@ -54,10 +54,10 @@ section#panzer
   #ngos
     @include span-columns(11)
     @include shift(1)
-#peacekeeping
-  .voronoi path
-    fill: none
-    pointer-events: all
+.voronoi path
+  fill: none
+  pointer-events: all
+.linegraph
   svg.countries, g.countries, g.mean
     margin: 10px 0
     .line