fix bootstrap default index
Former-commit-id: cd8acd7a19085ce9c471324148b8a5192a79b2ae
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,19 +1,34 @@
[submodule "couchdb/couchdb-lucene"]
path = couchdb/couchdb-lucene
url = https://github.com/rnewson/couchdb-lucene.git
-[submodule "couchdb/settee"]
- path = couchdb/settee
- url = https://github.com/inadarei/settee.git
-[submodule "lib/springy"]
- path = lib/springy
- url = https://github.com/dhotson/springy.git
[submodule "lib/php-diff"]
path = lib/php-diff
url = https://github.com/chrisboulton/php-diff.git
-[submodule "javascripts/flot"]
- path = javascripts/flot
- url = https://github.com/paradoxxxzero/flot.git
[submodule "lib/Requests"]
path = lib/Requests
url = https://github.com/rmccue/Requests.git
+[submodule "js/flotr2"]
+ path = js/flotr2
+ url = https://github.com/HumbleSoftware/Flotr2.git
+[submodule "lib/phpquery"]
+ path = lib/phpquery
+ url = https://github.com/TobiaszCudnik/phpquery.git
+[submodule "js/sigma"]
+ path = js/sigma
+ url = https://github.com/jacomyal/sigma.js.git
+[submodule "js/bubbletree"]
+ path = js/bubbletree
+ url = https://github.com/okfn/bubbletree.git
+[submodule "lib/querypath"]
+ path = lib/querypath
+ url = https://github.com/technosophos/querypath.git
+[submodule "lib/amon-php"]
+ path = lib/amon-php
+ url = https://github.com/martinrusev/amon-php.git
+[submodule "documents/lib/parsedatetime"]
+ path = documents/lib/parsedatetime
+ url = git://github.com/bear/parsedatetime.git
+[submodule "lib/FeedWriter"]
+ path = lib/FeedWriter
+ url = https://github.com/mibe/FeedWriter
--- a/about.php
+++ b/about.php
@@ -1,20 +1,15 @@
<?php
include_once('include/common.inc.php');
-include_header();
+include_header('About');
?>
<div class="foundation-header">
<h1><a href="about.php">About/FAQ</a></h1>
- <h4 class="subheader">Lorem ipsum.</h4>
</div>
-<h2> What is this? </h2>
-Disclosr is a project to monitor Australian Federal Government agencies
-compliance with their <a href="http://www.oaic.gov.au/publications/other_operational/foi_policy_frequently_asked_questions.html#_Toc291837571">"proactive disclosure requirements"</a>.
-OGRE (Open Government Realization Evaluation) is a ranking of compliance with these requirements.
-Prometheus is the agent which polls agency websites to assess compliance.
-
-<h2> Open everything </h2>
-All documents released CC-BY 3 AU
-Open source git @
+<h2> Attributions </h2>
+National Archives of Australia, Australian Governments’ Interactive Functions Thesaurus, 2nd edition, September 2005, published at http://www.naa.gov.au/recordkeeping/thesaurus/index.htm <br/>
+data.gov.au http://data.gov.au/dataset/directory-gov-au-full-data-export/ <br/>
+directory.gov.au <br/>
+australia.gov.au http://australia.gov.au/about/copyright <br/>
<h2>Organisational Data Sources</h2>
@@ -23,17 +18,17 @@
http://www.finance.gov.au/publications/flipchart/docs/FMACACFlipchart.pdf summarises these. view-source:https://www.tenders.gov.au/?event=public.advancedsearch.home is great for the suspended/active status<br>
-Fraud in gov depts by Fairfax Media http://www.smh.com.au/national/public-service-keeps-fraud-cases-private-20110923-1kpdr.html
+Fraud in gov depts by Fairfax Media http://www.smh.com.au/national/public-service-keeps-fraud-cases-private-20110923-1kpdr.html <br>
When defining the hierachy, this system is designed towards monitoring accountablity. Thus large agencies that have registered their own ABN
-and have their own accountablity mechanisms/website receive a seperate record as a child of their department.
+and have their own accountablity mechanisms/website receive a seperate record as a child of their department.<br>
Some small agencies will choose to simply rely on their parent department's accountablity measures.<br>
-This flows through to organisation name and other/past names. A department that completely accounts for an agency will list that agency as an other child name.
-As agencies themselves shift between departments, there may be scope for providing time ranges but typically the newest hierarchy will be the one recorded.
+This flows through to organisation name and other/past names. A department that completely accounts for an agency will list that agency as an other child name.<br>
+As agencies themselves shift between departments, there may be scope for providing time ranges but typically the newest hierarchy will be the one recorded.<br>
A department/agency name will be the newest active name assigned to that ABN.<br>
-ABN information is derived from the ABR. This is the definitive umpire about which former name should be linked to which current name.
+ABN information is derived from the ABR. This is the definitive umpire about which former name should be linked to which current name. <br>
For example "Department of Transport and Regional Services" became "Department of Infrastructure, Transport, Regional Development and Local Government" (same ABN)
however it later split into "Department of Infrastructure and Transport" (same ABN)
and "Department of Regional Australia, Regional Development and Local Government" (new ABN).<br>
@@ -41,24 +36,7 @@
Statistical information from http://www.apsc.gov.au/stateoftheservice/1011/statsbulletin/section1.html#t2total https://www.apsedii.gov.au/apsedii/CustomQueryx33.shtml
and individual annual reports.<br>
-<h2>Webpage Assessment</h2>
-Much due care has been put into correctly recording disclosure URLs. Typically the "About", "Corporate", "Publications" and "Sitemap" sections are checked at the very least.
-Occasionally it is nessicary to use a site or Google search. In several rare cases, there is a secret "Disclosure" navigation menu you can find if you find one of the mandatory publishing obligations in that category (seriously).<br>
-Some rules about leniency:<br>
-<ul>
- <li>An empty FOI disclosure log counts, a page outlining what the FOI Act is does not.</li>
- <li>A disclosure log in PDF or Word format counts :(</li>
- <li>An empty File/Record list counts (although that's very minimalistic that you have no files, electronic or paper)</li>
- <li>Only a current information publication scheme page counts, not a s.9 FOI Act page or an organisation chart.</li>
- <li>If there isn't a page easily listing all current and past Annual Reports, the most current one (html, pdf) counts.</li>
- <li>Consultancy contracts might not need it's own webpage (if in Annual Report), grants/appointments might not apply to all organisations but Legal Services Expenditure (and all other obligations) does need a webpage. </li>
-
-<h2>Open Government Scoring</h2>
-+1 point for every true Has... attribute<br>
--1 point for every false Has... (ie. Has Not) attribute</br>
-
-Don't like this? Make your own score, suggest a better scoring mechanism.</br>
-
<?php
include_footer();
?>
+
--- a/admin/0203apsemployees.csv
+++ b/admin/0203apsemployees.csv
@@ -1,75 +1,75 @@
-"Agriculture, Fisheries & Forestry",3530
-Attorney-Generals,708
-Administrative Appeals Tribunal,108
-AUSTRAC,60
-Australian Crime Commission,225
-Australian Customs Service,4934
-Australian Protective Service,1124
-CrimTrac Agency,34
-Family Court of Australia,574
-Federal Court of Australia,221
-Federal Magistrates Service,46
-Federal Privacy Commissioner,32
-HREOC,79
-ITSA,227
-National Native Title Tribunal,241
-Office of the D.P.P.,403
-Office of Film & Literature Class,39
-Office of the Parl. Counsel,45
-Communications IT & the Arts,776
-Aust. Broadcasting Authority,114
-Aust. Communications Authority,391
-Aust. National Maritime Museum,90
-National Archives of Australia,363
-National Library of Australia,443
-National Museum of Australia,185
-NOIE,160
-Defence,18231
-Defence Housing Authority,661
-DEST,1464
-Australian Research Council,50
-DEWR,2055
-EOWA,11
-Australian Industrial Registry,185
-Comcare,300
-NOHSC,89
-Environment and Heritage,1271
-Australian Greenhouse Office,167
-Bureau of Meteorology,1403
-GBRMPA,153
-National Oceans Office,31
-Family and Community Services,4832
-Aust. Institute of Family Studies,39
-Centrelink,25147
-Finance and Administration,771
-Australian Electoral Comm.,729
-ComSuper,338
-Foreign Affairs & Trade,2763
-ACIAR,44
-Health & Ageing,5137
-Aust. Institute of Health & Welfare,152
-ARPANSA,126
-FSANZ,110
-PSR,25
-DIMIA,4089
-Aboriginal Hostels Ltd.,341
-ATSIC,1072
-AIATSIS,62
-Torres Strait Regional Authority,30
-Industry Tourism & Resources,2691
-Prime Minister & Cabinet,344
-ANAO,278
-Commonwealth Ombudsman,78
-Office of National Assessments,47
-APS Commission,164
-Transport & Regional Services,945
-National Capital Authority,76
-Treasury,906
-Australian Bureau of Statistics,3024
-ACCC,446
-ASIC,1048
-Australian Taxation Office,20238
-Productivity Commission,197
-Veterans Affairs,2335
-Australian War Memorial,215
+"Agriculture, Fisheries & Forestry",3530
+Attorney-Generals,708
+Administrative Appeals Tribunal,108
+AUSTRAC,60
+Australian Crime Commission,225
+Australian Customs Service,4934
+Australian Protective Service,1124
+CrimTrac Agency,34
+Family Court of Australia,574
+Federal Court of Australia,221
+Federal Magistrates Service,46
+Federal Privacy Commissioner,32
+HREOC,79
+ITSA,227
+National Native Title Tribunal,241
+Office of the D.P.P.,403
+Office of Film & Literature Class,39
+Office of the Parl. Counsel,45
+Communications IT & the Arts,776
+Aust. Broadcasting Authority,114
+Aust. Communications Authority,391
+Aust. National Maritime Museum,90
+National Archives of Australia,363
+National Library of Australia,443
+National Museum of Australia,185
+NOIE,160
+Defence,18231
+Defence Housing Authority,661
+DEST,1464
+Australian Research Council,50
+DEWR,2055
+EOWA,11
+Australian Industrial Registry,185
+Comcare,300
+NOHSC,89
+Environment and Heritage,1271
+Australian Greenhouse Office,167
+Bureau of Meteorology,1403
+GBRMPA,153
+National Oceans Office,31
+Family and Community Services,4832
+Aust. Institute of Family Studies,39
+Centrelink,25147
+Finance and Administration,771
+Australian Electoral Comm.,729
+ComSuper,338
+Foreign Affairs & Trade,2763
+ACIAR,44
+Health & Ageing,5137
+Aust. Institute of Health & Welfare,152
+ARPANSA,126
+FSANZ,110
+PSR,25
+DIMIA,4089
+Aboriginal Hostels Ltd.,341
+ATSIC,1072
+AIATSIS,62
+Torres Strait Regional Authority,30
+Industry Tourism & Resources,2691
+Prime Minister & Cabinet,344
+ANAO,278
+Commonwealth Ombudsman,78
+Office of National Assessments,47
+APS Commission,164
+Transport & Regional Services,945
+National Capital Authority,76
+Treasury,906
+Australian Bureau of Statistics,3024
+ACCC,446
+ASIC,1048
+Australian Taxation Office,20238
+Productivity Commission,197
+Veterans Affairs,2335
+Australian War Memorial,215
--- a/admin/0304apsemployees.csv
+++ b/admin/0304apsemployees.csv
@@ -1,78 +1,78 @@
-"Agriculture, Fisheries and Forestry",3928
-Attorney-General's,781
-Administrative Appeals Tribunal,117
-AUSTRAC,61
-Australian Crime Commission,315
-Australian Customs Service,4736
-Australian Protective Service,1234
-CrimTrac Agency,44
-Family Court of Australia,608
-Federal Court of Australia,238
-Federal Magistrates Service,56
-Federal Privacy Commissioner,29
-HREOC,84
-ITSA,240
-National Native Title Tribunal,243
-Office of the D.P.P.,416
-Office of Film & Literature Class.,37
-Office of Parliamentary Counsel,46
-Communications IT & the Arts,607
-Aust. Broadcasting Authority,114
-Aust. Communications Authority,407
-Australian Film Commission,176
-AGIMO,95
-Aust. National Maritime Museum,93
-National Archives of Australia,386
-National Library of Australia,438
-National Museum of Australia,186
-Defence,18301
-Defence Housing Authority,679
-DEST,1684
-Australian Research Council,53
-DEWR,2171
-Australian Industrial Registry,188
-Comcare,325
-EOWA,10
-NOHSC,89
-Environment and Heritage,1276
-Australian Greenhouse Office,166
-Bureau of Meteorology,1371
-GBRMPA,162
-National Oceans Office,39
-Family and Community Services,4818
-Aust. Institute of Family Studies,38
-Centrelink,24904
-Finance and Administration,895
-Australian Electoral Comm.,765
-ComSuper,329
-Foreign Affairs and Trade,2809
-ACIAR,40
-Health and Ageing,5365
-Aust. Institute of Health & Welfare,157
-ARPANSA,117
-FSANZ,104
-National Blood Authority,33
-OPSR,27
-DIMIA,4487
-Aboriginal Hostels Ltd.,291
-AIATSIS,59
-ATSIC,24
-ATSIS,1109
-Torres Strait Regional Authority,34
-"Industry, Tourism & Resources",2878
-Prime Minister & Cabinet,372
-ANAO,287
-APS Commission,172
-Commonwealth Ombudsman,82
-Office of National Assessments,51
-Transport & Regional Services,885
-National Capital Authority,68
-Treasury,984
-Australian Bureau of Statistics,2866
-ACCC,450
-ASIC,1137
-Australian Taxation Office,20501
-Productivity Commission,183
-Veterans' Affairs,2356
-Australian War Memorial,196
+"Agriculture, Fisheries and Forestry",3928
+Attorney-General's,781
+Administrative Appeals Tribunal,117
+AUSTRAC,61
+Australian Crime Commission,315
+Australian Customs Service,4736
+Australian Protective Service,1234
+CrimTrac Agency,44
+Family Court of Australia,608
+Federal Court of Australia,238
+Federal Magistrates Service,56
+Federal Privacy Commissioner,29
+HREOC,84
+ITSA,240
+National Native Title Tribunal,243
+Office of the D.P.P.,416
+Office of Film & Literature Class.,37
+Office of Parliamentary Counsel,46
+Communications IT & the Arts,607
+Aust. Broadcasting Authority,114
+Aust. Communications Authority,407
+Australian Film Commission,176
+AGIMO,95
+Aust. National Maritime Museum,93
+National Archives of Australia,386
+National Library of Australia,438
+National Museum of Australia,186
+Defence,18301
+Defence Housing Authority,679
+DEST,1684
+Australian Research Council,53
+DEWR,2171
+Australian Industrial Registry,188
+Comcare,325
+EOWA,10
+NOHSC,89
+Environment and Heritage,1276
+Australian Greenhouse Office,166
+Bureau of Meteorology,1371
+GBRMPA,162
+National Oceans Office,39
+Family and Community Services,4818
+Aust. Institute of Family Studies,38
+Centrelink,24904
+Finance and Administration,895
+Australian Electoral Comm.,765
+ComSuper,329
+Foreign Affairs and Trade,2809
+ACIAR,40
+Health and Ageing,5365
+Aust. Institute of Health & Welfare,157
+ARPANSA,117
+FSANZ,104
+National Blood Authority,33
+OPSR,27
+DIMIA,4487
+Aboriginal Hostels Ltd.,291
+AIATSIS,59
+ATSIC,24
+ATSIS,1109
+Torres Strait Regional Authority,34
+"Industry, Tourism & Resources",2878
+Prime Minister & Cabinet,372
+ANAO,287
+APS Commission,172
+Commonwealth Ombudsman,82
+Office of National Assessments,51
+Transport & Regional Services,885
+National Capital Authority,68
+Treasury,984
+Australian Bureau of Statistics,2866
+ACCC,450
+ASIC,1137
+Australian Taxation Office,20501
+Productivity Commission,183
+Veterans' Affairs,2356
+Australian War Memorial,196
--- a/admin/0405apsemployees.csv
+++ b/admin/0405apsemployees.csv
@@ -1,88 +1,88 @@
-"Agriculture, Fisheries & Forestry ",1297
-AQIS,3028
-Attorney-Generals ,1011
-Administrative Appeals Tribunal,154
-AUSTRAC,137
-Australian Crime Commission,412
-Australian Customs Service,5054
-Commonwealth DPP,451
-CrimTrac Agency,51
-Family Court of Australia,737
-Federal Court of Australia,403
-Federal Magistrates Service,102
-Federal Privacy Commissioner,40
-HREOC,95
-ITSA,275
-National Native Title Tribunal,265
-Office of Film & Literature Class,41
-Office of the Parl. Counsel,43
-"Communications, IT & the Arts ",804
-Aust. Broadcasting Authority,106
-Aust. Communications Authority,416
-Australian Film Commission,167
-Aust. National Maritime Museum,114
-National Archives of Australia,514
-National Library of Australia,523
-National Museum of Australia,260
-Defence ,18638
-Defence Housing Authority,685
-DEST ,2001
-Australian Research Council,71
-Questacon,211
-DEWR ,3141
-Australian Industrial Registry,202
-Comcare,384
-EOWA,28
-Environment & Heritage ,1852
-Bureau of Meteorology,1442
-GBRMPA,170
-ORER,11
-Family & Community Services ,1949
-Aust. Institute of Family Studies,66
-Finance & Administration ,1297
-Australian Electoral Comm.,808
-Commonwealth Grants Commission,40
-ComSuper,393
-Foreign Affairs & Trade ,2468
-ACIAR,47
-AusAID,615
-Health & Ageing ,4220
-Aust. Institute of Health & Welfare,215
-ARPANSA,130
-FSANZ,121
-National Blood Authority,40
-Professional Services Review,18
-Human Services ,37
-Centrelink,25317
-Child Support Agency,3238
-CRS Australia,1998
-Immigration ,5769
-Aboriginal Hostels Ltd.,458
-AIATSIS,116
-Migration Review Tribunal,132
-Refugee Review Tribunal,176
-Torres Strait Regional Authority,48
-"Industry, Tourism & Resources ",1906
-Geoscience Australia,635
-IP Australia,821
-NOPSA,28
-Prime Minister & Cabinet ,402
-ANAO,313
-Australian Public Service Commission,211
-Commonwealth Ombudsman,113
-National Water Commission,27
-Office of National Assessments,93
-Transport & Regional Services ,1178
-National Capital Authority,91
-Treasury ,885
-Australian Bureau of Statistics,3095
-ACCC,509
-AOFM,33
-ASIC,1494
-Australian Taxation Office,23417
-National Competition Council,11
-Productivity Commission,200
-Royal Australian Mint,117
-Veterans Affairs ,2655
-Australian War Memorial,310
+"Agriculture, Fisheries & Forestry ",1297
+AQIS,3028
+Attorney-Generals ,1011
+Administrative Appeals Tribunal,154
+AUSTRAC,137
+Australian Crime Commission,412
+Australian Customs Service,5054
+Commonwealth DPP,451
+CrimTrac Agency,51
+Family Court of Australia,737
+Federal Court of Australia,403
+Federal Magistrates Service,102
+Federal Privacy Commissioner,40
+HREOC,95
+ITSA,275
+National Native Title Tribunal,265
+Office of Film & Literature Class,41
+Office of the Parl. Counsel,43
+"Communications, IT & the Arts ",804
+Aust. Broadcasting Authority,106
+Aust. Communications Authority,416
+Australian Film Commission,167
+Aust. National Maritime Museum,114
+National Archives of Australia,514
+National Library of Australia,523
+National Museum of Australia,260
+Defence ,18638
+Defence Housing Authority,685
+DEST ,2001
+Australian Research Council,71
+Questacon,211
+DEWR ,3141
+Australian Industrial Registry,202
+Comcare,384
+EOWA,28
+Environment & Heritage ,1852
+Bureau of Meteorology,1442
+GBRMPA,170
+ORER,11
+Family & Community Services ,1949
+Aust. Institute of Family Studies,66
+Finance & Administration ,1297
+Australian Electoral Comm.,808
+Commonwealth Grants Commission,40
+ComSuper,393
+Foreign Affairs & Trade ,2468
+ACIAR,47
+AusAID,615
+Health & Ageing ,4220
+Aust. Institute of Health & Welfare,215
+ARPANSA,130
+FSANZ,121
+National Blood Authority,40
+Professional Services Review,18
+Human Services ,37
+Centrelink,25317
+Child Support Agency,3238
+CRS Australia,1998
+Immigration ,5769
+Aboriginal Hostels Ltd.,458
+AIATSIS,116
+Migration Review Tribunal,132
+Refugee Review Tribunal,176
+Torres Strait Regional Authority,48
+"Industry, Tourism & Resources ",1906
+Geoscience Australia,635
+IP Australia,821
+NOPSA,28
+Prime Minister & Cabinet ,402
+ANAO,313
+Australian Public Service Commission,211
+Commonwealth Ombudsman,113
+National Water Commission,27
+Office of National Assessments,93
+Transport & Regional Services ,1178
+National Capital Authority,91
+Treasury ,885
+Australian Bureau of Statistics,3095
+ACCC,509
+AOFM,33
+ASIC,1494
+Australian Taxation Office,23417
+National Competition Council,11
+Productivity Commission,200
+Royal Australian Mint,117
+Veterans Affairs ,2655
+Australian War Memorial,310
--- a/admin/0506apsemployees.csv
+++ b/admin/0506apsemployees.csv
@@ -1,90 +1,90 @@
-"Agriculture, Fisheries & Forestry",1498
-AQIS,3289
-Attorney-Generals,1226
-Administrative Appeals Tribunal,156
-AUSTRAC,141
-Australian Crime Commission,425
-Australian Customs Service,5574
-CrimTrac Agency,53
-Family Court of Australia,765
-Federal Court of Australia,412
-Federal Magistrates Service,112
-Federal Privacy Commissioner,44
-HREOC,102
-ITSA,270
-National Native Title Tribunal,244
-Commonwealth DPP,469
-Office of Film & Literature Class,49
-Office of the Parl. Counsel,46
-"Communications, IT & the Arts",833
-Australian Communications & Media Authority,497
-Australian Film Commission,255
-Australian National Maritime Museum,107
-Australian Sports Anti-Doping Authority,46
-National Archives of Australia,467
-National Library of Australia,499
-National Museum of Australia,301
-Defence,19791
-Defence Housing Authority,699
-DEST,2359
-AIATSIS,128
-Australian Research Council,69
-Questacon,230
-DEWR,3853
-Australian Building and Construction Commission,85
-Australian Fair Pay Commission,11
-Australian Industrial Registry,175
-Comcare,379
-EOWA,30
-Office of Workplace Services,188
-Environment & Heritage,2060
-Bureau of Meteorology,1404
-GBRMPA,172
-ORER,11
-FaCSIA,2589
-Aboriginal Hostels Ltd.,489
-Australian Institute of Family Studies,53
-Torres Strait Regional Authority,72
-Finance & Administration,1409
-Australian Electoral Commission,790
-Commonwealth Grants Commission,41
-ComSuper,435
-Foreign Affairs & Trade,2551
-ACIAR,50
-AusAID,706
-Health & Ageing,4301
-Australian Institute of Health & Welfare,203
-ARPANSA,136
-FSANZ,125
-National Blood Authority,52
-Professional Services Review,14
-Human Services,5545
-Centrelink,26549
-Medicare Australia,5393
-Immigration,6341
-Migration Review Tribunal,103
-Refugee Review Tribunal,161
-"Industry, Tourism & Resources",1979
-Geoscience Australia,669
-IP AUSTRALIA,888
-NOPSA,34
-Prime Minister & Cabinet,590
-ANAO,308
-Australian Public Service Commission,253
-Commonwealth Ombudsman,141
-National Water Commission,45
-Office of National Assessments,122
-Transport & Regional Services,1327
-National Capital Authority,95
-Treasury,915
-Australian Bureau of Statistics,3511
-ACCC,582
-AOFM,39
-ASIC,1540
-Australian Taxation Office,22568
-National Competition Council,9
-Productivity Commission,205
-Royal Australian Mint,145
-Veterans Affairs,2521
-Australian War Memorial,316
+"Agriculture, Fisheries & Forestry",1498
+AQIS,3289
+Attorney-Generals,1226
+Administrative Appeals Tribunal,156
+AUSTRAC,141
+Australian Crime Commission,425
+Australian Customs Service,5574
+CrimTrac Agency,53
+Family Court of Australia,765
+Federal Court of Australia,412
+Federal Magistrates Service,112
+Federal Privacy Commissioner,44
+HREOC,102
+ITSA,270
+National Native Title Tribunal,244
+Commonwealth DPP,469
+Office of Film & Literature Class,49
+Office of the Parl. Counsel,46
+"Communications, IT & the Arts",833
+Australian Communications & Media Authority,497
+Australian Film Commission,255
+Australian National Maritime Museum,107
+Australian Sports Anti-Doping Authority,46
+National Archives of Australia,467
+National Library of Australia,499
+National Museum of Australia,301
+Defence,19791
+Defence Housing Authority,699
+DEST,2359
+AIATSIS,128
+Australian Research Council,69
+Questacon,230
+DEWR,3853
+Australian Building and Construction Commission,85
+Australian Fair Pay Commission,11
+Australian Industrial Registry,175
+Comcare,379
+EOWA,30
+Office of Workplace Services,188
+Environment & Heritage,2060
+Bureau of Meteorology,1404
+GBRMPA,172
+ORER,11
+FaCSIA,2589
+Aboriginal Hostels Ltd.,489
+Australian Institute of Family Studies,53
+Torres Strait Regional Authority,72
+Finance & Administration,1409
+Australian Electoral Commission,790
+Commonwealth Grants Commission,41
+ComSuper,435
+Foreign Affairs & Trade,2551
+ACIAR,50
+AusAID,706
+Health & Ageing,4301
+Australian Institute of Health & Welfare,203
+ARPANSA,136
+FSANZ,125
+National Blood Authority,52
+Professional Services Review,14
+Human Services,5545
+Centrelink,26549
+Medicare Australia,5393
+Immigration,6341
+Migration Review Tribunal,103
+Refugee Review Tribunal,161
+"Industry, Tourism & Resources",1979
+Geoscience Australia,669
+IP AUSTRALIA,888
+NOPSA,34
+Prime Minister & Cabinet,590
+ANAO,308
+Australian Public Service Commission,253
+Commonwealth Ombudsman,141
+National Water Commission,45
+Office of National Assessments,122
+Transport & Regional Services,1327
+National Capital Authority,95
+Treasury,915
+Australian Bureau of Statistics,3511
+ACCC,582
+AOFM,39
+ASIC,1540
+Australian Taxation Office,22568
+National Competition Council,9
+Productivity Commission,205
+Royal Australian Mint,145
+Veterans Affairs,2521
+Australian War Memorial,316
--- a/admin/0607apsemployees.csv
+++ b/admin/0607apsemployees.csv
@@ -1,92 +1,92 @@
-"Agriculture, Fisheries & Forestry",4951
-Attorney-Generals,1504
-Administrative Appeals Tribunal,162
-AUSTRAC,247
-ACLEI,6
-Australian Crime Commission,554
-Australian Customs Service,5904
-CrimTrac Agency,81
-Family Court of Australia,727
-Federal Court of Australia,401
-Federal Magistrates Court,160
-Federal Privacy Commissioner,58
-HREOC,116
-ITSA,285
-National Native Title Tribunal,244
-Commonwealth DPP,497
-Office of the Parl. Counsel,48
-"Communications, IT & the Arts",914
-ACMA,552
-Australian Film Commission,244
-Aust. National Maritime Museum,109
-ASADA,55
-National Archives of Australia,465
-National Library of Australia,521
-National Museum of Australia,282
-Defence,21177
-Defence Housing Australia,699
-DEST,2470
-AIATSIS,114
-Australian Research Council,73
-Questacon,231
-DEWR,3862
-ABCC,128
-Australian Fair Pay Commission,28
-Australian Industrial Registry,175
-Comcare,426
-EOWA,21
-Office of Workplace Services,303
-Environment & Water Resources,2292
-Bureau of Meteorology,1451
-GBRMPA,171
-ORER,11
-FaCSIA,3099
-Aboriginal Hostels Ltd.,491
-Aust. Institute of Family Studies,59
-Torres Strait Regional Authority,76
-Finance & Administration,1514
-Australian Electoral Commission,886
-Commonwealth Grants Commission,41
-ComSuper,595
-Future Fund Management Agency,12
-Foreign Affairs & Trade,2784
-ACIAR,52
-AusAID,775
-Austrade,515
-Health & Ageing,4830
-Aust. Institute of Health & Welfare,211
-ARPANSA,134
-Cancer Australia,26
-FSANZ,131
-National Blood Authority,50
-NHMRC,221
-Professional Services Review,16
-Human Services,6433
-Centrelink,27296
-Medicare Australia,5959
-Immigration,6788
-MRT/RRT,304
-"Industry, Tourism & Resources",2075
-Geoscience Australia,682
-IP AUSTRALIA,913
-NOPSA,42
-Prime Minister & Cabinet,711
-ANAO,330
-Australian Public Service Commission,250
-Commonwealth Ombudsman,153
-National Water Commission,32
-Office of National Assessments,133
-Transport & Regional Services,1330
-National Capital Authority,106
-Treasury,996
-Australian Bureau of Statistics,3167
-ACCC,647
-AOFM,33
-ASIC,1664
-Australian Taxation Office,23110
-National Competition Council,9
-Productivity Commission,207
-Royal Australian Mint,181
-Veterans' Affairs,2401
-Australian War Memorial,293
+"Agriculture, Fisheries & Forestry",4951
+Attorney-Generals,1504
+Administrative Appeals Tribunal,162
+AUSTRAC,247
+ACLEI,6
+Australian Crime Commission,554
+Australian Customs Service,5904
+CrimTrac Agency,81
+Family Court of Australia,727
+Federal Court of Australia,401
+Federal Magistrates Court,160
+Federal Privacy Commissioner,58
+HREOC,116