Skip to content

Commit

Permalink
Code upgraded
Browse files Browse the repository at this point in the history
  • Loading branch information
@aunindadf
aunindadf committed Feb 11, 2016
1 parent 430679e commit 8228c00
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 69 deletions.
4 changes: 2 additions & 2 deletions devtracker.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
include RecaptchaHelper

# Developer Machine: set global settings
#set :oipa_api_url, 'http://dfid-oipa.zz-clients.net/api/'
set :oipa_api_url, 'http://dfid-oipa.zz-clients.net/api/'
#set :oipa_api_url, 'https://devtracker.dfid.gov.uk/api/'
#set :oipa_api_url, 'http://loadbalancer1-dfid.oipa.nl/api/'

# Server Machine: set global settings to use varnish cache
set :oipa_api_url, 'http://127.0.0.1:6081/api/'
#set :oipa_api_url, 'http://127.0.0.1:6081/api/'

#ensures that we can use the extension html.erb rather than just .erb
Tilt.register Tilt::ERBTemplate, 'html.erb'
Expand Down
10 changes: 5 additions & 5 deletions helpers/country_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_top_5_countries()

countriesInfo = JSON.parse(File.read('data/countries.json'))

top5countriesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-1&group_by=recipient_country&aggregations=budget&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&order_by=-budget&page_size=5"
top5countriesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?reporting_organisation=GB-1&group_by=recipient_country&aggregations=budget&budget_period_start=#{firstDayOfFinYear}&budget_period_end=#{lastDayOfFinYear}&order_by=-budget&page_size=5&format=json"
top5countries = JSON.parse(top5countriesJSON)

top5countriesBudget = top5countries["results"].map do |elem|
Expand Down Expand Up @@ -291,7 +291,7 @@ def get_country_all_projects_data(countryCode)
allProjectsData['countryAllProjectFilters'] = get_static_filter_list()
allProjectsData['country'] = get_country_code_name(countryCode)
allProjectsData['results'] = get_country_results(countryCode)
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=description,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,aggregations&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"
allProjectsData['projects']= JSON.parse(oipa_project_list)
sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_recipient_country=#{countryCode}"
allProjectsData['highLevelSectorList'] = high_level_sector_list_filter(sectorValuesJSON)
Expand All @@ -300,7 +300,7 @@ def get_country_all_projects_data(countryCode)
allProjectsData['actualStartDate'] = '1990-01-01T00:00:00'
allProjectsData['plannedEndDate'] = '2000-01-01T00:00:00'
unless allProjectsData['projects']['results'][0].nil?
allProjectsData['project_budget_higher_bound'] = allProjectsData['projects']['results'][0]['activity_plus_child_aggregation']['budget_value']
allProjectsData['project_budget_higher_bound'] = allProjectsData['projects']['results'][0]['aggregations']['activity_children']['budget_value']
end
###allProjectsData['actualStartDate'] = RestClient.get settings.oipa_api_url + "activities?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date"
###allProjectsData['actualStartDate'] = JSON.parse(allProjectsData['actualStartDate'])
Expand All @@ -317,7 +317,7 @@ def get_country_all_projects_data(countryCode)

def get_country_all_projects_data_para(countryCode)
allProjectsData = {}
apiLinks = [{"title"=>"oipa_project_list", "link"=>"activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=description,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"},{"title"=>"sectorValuesJSON", "link"=>"activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_recipient_country=#{countryCode}"},{"title"=>"actualStartDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date"},{"title"=>"plannedEndDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-planned_end_date"}]
apiLinks = [{"title"=>"oipa_project_list", "link"=>"activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,aggregations&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_country=#{countryCode}"},{"title"=>"sectorValuesJSON", "link"=>"activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_recipient_country=#{countryCode}"},{"title"=>"actualStartDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=actual_start_date"},{"title"=>"plannedEndDate", "link"=>"activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-planned_end_date"}]
returnedAPIData = ""
EM.synchrony do
concurrency = 4
Expand Down Expand Up @@ -354,7 +354,7 @@ def get_country_all_projects_data_para(countryCode)
end

def get_country_all_projects_rss(countryCode)
rssJSON = RestClient.get settings.oipa_api_url + "activities/?format=json&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-last_updated_datetime&fields=last_updated_datetime,title,description,iati_identifier&page_size=500"
rssJSON = RestClient.get settings.oipa_api_url + "activities/?format=json&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_country=#{countryCode}&ordering=-last_updated_datetime&fields=last_updated_datetime,title,descriptions,iati_identifier&page_size=500"
rssData = JSON.parse(rssJSON)
rssResults = rssData['results']
end
Expand Down
6 changes: 3 additions & 3 deletions helpers/project_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ def get_funding_project_details(projectId)
end

def get_funded_project_details(projectId)
fundedProjectsAPI = RestClient.get settings.oipa_api_url + "activities/?format=json&transaction_provider_activity=#{projectId}&page_size=1000&fields=id,title,description,reporting_organisations,activity_plus_child_aggregation,default_currency&ordering=title"
fundedProjectsAPI = RestClient.get settings.oipa_api_url + "activities/?format=json&transaction_provider_activity=#{projectId}&page_size=1000&fields=id,title,descriptions,reporting_organisations,activity_plus_child_aggregation,default_currency,aggregations&ordering=title"
fundedProjectsData = JSON.parse(fundedProjectsAPI)
end

def get_transaction_details(projectId)
if is_dfid_project(projectId) then
oipaTransactionsJSON = RestClient.get settings.oipa_api_url + "transactions/?format=json&activity_related_activity_id=#{projectId}&page_size=400&fields=activity,description,provider_organisation,provider_activity,receiver_organisation,transaction_date,transaction_type,value,currency"
oipaTransactionsJSON = RestClient.get settings.oipa_api_url + "transactions/?format=json&activity_related_activity_id=#{projectId}&page_size=400&fields=aggregations,activity,description,provider_organisation,provider_activity,receiver_organisation,transaction_date,transaction_type,value,currency"
else
oipaTransactionsJSON = RestClient.get settings.oipa_api_url + "transactions/?format=json&activity=#{projectId}&page_size=400&fields=activity,description,provider_organisation,receiver_organisation,transaction_date,transaction_type,value,currency"
oipaTransactionsJSON = RestClient.get settings.oipa_api_url + "transactions/?format=json&activity=#{projectId}&page_size=400&fields=aggregations,activity,description,provider_organisation,receiver_organisation,transaction_date,transaction_type,value,currency"
end

transactionsJSON = JSON.parse(oipaTransactionsJSON)
Expand Down
6 changes: 3 additions & 3 deletions helpers/region_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def get_region_details(regionCode)
returnObject = {
:code => region['code'],
:name => region['name'],
:description => region['description'],
:description => region['descriptions'],
:type => region['type'],
:url => region['url'],
:totalProjects => totalProjectsDetails['count'],
Expand Down Expand Up @@ -106,7 +106,7 @@ def dfid_regional_projects_data(regionType)

#Here variable n = related_activity_recipient_region
def get_region_projects(n)
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=description,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_region=#{n}"
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=aggregations,descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_recipient_region=#{n}"
projects= JSON.parse(oipa_project_list)
results = {}
sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_recipient_region=#{n}"
Expand All @@ -115,7 +115,7 @@ def get_region_projects(n)
results['actualStartDate'] = '1990-01-01T00:00:00'
results['plannedEndDate'] = '2000-01-01T00:00:00'
unless projects['results'][0].nil?
results['project_budget_higher_bound'] = projects['results'][0]['activity_plus_child_aggregation']['budget_value']
results['project_budget_higher_bound'] = projects['results'][0]['aggregations']['activity_children']['budget_value']
end
###results['actualStartDate'] = RestClient.get settings.oipa_api_url + "activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_recipient_region=#{n}&ordering=actual_start_date"
###results['actualStartDate'] = JSON.parse(results['actualStartDate'])
Expand Down
6 changes: 3 additions & 3 deletions helpers/search_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ def generate_searched_data(query)
# Sample Api call - http://&fields=activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation
# The following api call returns the projects list based on the search query. The result is returned with data sorted
# by budget value so that we can get the budget higher bound from a single api call.
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&page_size=10&fields=description,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&q=#{query}&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&reporting_organisation_startswith=GB"
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&page_size=10&fields=aggregations,descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&q=#{query}&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&reporting_organisation_startswith=GB"
projects_list= JSON.parse(oipa_project_list)
searchedData['projects'] = projects_list['results'] # Storing the returned project list
# Checking if the returned result count is 0 or not. If not, then store the budget value of the first item from the returned search data.
unless projects_list['count'] == 0
unless projects_list['results'][0]['activity_plus_child_aggregation']['budget_value'].nil?
searchedData['project_budget_higher_bound'] = projects_list['results'][0]['activity_plus_child_aggregation']['budget_value']
unless projects_list['results'][0]['aggregations']['activity_children']['budget_value'].nil?
searchedData['project_budget_higher_bound'] = projects_list['results'][0]['aggregations']['activity_children']['budget_value']
end
end
searchedData['project_count'] = projects_list['count'] # Stored the project count here
Expand Down
6 changes: 3 additions & 3 deletions helpers/sector_helpers.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,19 @@ def sector_parent_data_list(apiUrl, pageType, code, description, parentCodeType,
end

def get_sector_projects(n)
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=description,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_sector=#{n}"
oipa_project_list = RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation,aggregations&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_sector=#{n}"
projects= JSON.parse(oipa_project_list)
results = {}
sectorValuesJSON = RestClient.get settings.oipa_api_url + "activities/aggregations/?format=json&group_by=sector&aggregations=count&reporting_organisation=GB-1&related_activity_sector=#{n}"
results['highLevelSectorList'] = high_level_sector_list_filter(sectorValuesJSON)
#results['LocationCountries'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=description,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_sector=#{n}")
#results['LocationCountries'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/?hierarchy=1&format=json&reporting_organisation=GB-1&page_size=10&fields=descriptions,activity_status,iati_identifier,url,title,reporting_organisations,activity_plus_child_aggregation&activity_status=1,2,3,4,5&ordering=-activity_plus_child_budget_value&related_activity_sector=#{n}")
results['LocationCountries'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/aggregations/?hierarchy=1&format=json&reporting_organisation=GB-1&group_by=recipient_country&aggregations=count&related_activity_sector=#{n}")
results['LocationRegions'] = JSON.parse(RestClient.get settings.oipa_api_url + "activities/aggregations/?hierarchy=1&format=json&reporting_organisation=GB-1&group_by=recipient_region&aggregations=count&related_activity_sector=#{n}")
results['project_budget_higher_bound'] = 0
results['actualStartDate'] = '1990-01-01T00:00:00'
results['plannedEndDate'] = '2000-01-01T00:00:00'
unless projects['results'][0].nil?
results['project_budget_higher_bound'] = projects['results'][0]['activity_plus_child_aggregation']['budget_value']
results['project_budget_higher_bound'] = projects['results'][0]['aggregations']['activity_children']['budget_value']
end
###results['actualStartDate'] = RestClient.get settings.oipa_api_url + "activities/?format=json&page_size=1&fields=activity_dates&reporting_organisation=GB-1&hierarchy=1&related_activity_sector=#{n}&ordering=actual_start_date"
###results['actualStartDate'] = JSON.parse(results['actualStartDate'])
Expand Down
Loading

0 comments on commit 8228c00

Please sign in to comment.