Merge branch 'devtracker-new-ui-fixed-merge-conflict' into devtracker-new-ui

Author: aunindadf

devtracker.rb

@@ -65,7 +65,8 @@
 
 # Server Machine: set global settings to use varnish cache
 #set :oipa_api_url, 'http://127.0.0.1:6081/search/'
-
+set :prod_api_url, 'https://fcdo.iati.cloud'
+set :dev_api_url, 'https://fcdo-staging.iati.cloud'
 
 
 #ensures that we can use the extension html.erb rather than just .erb
@@ -149,7 +150,7 @@
  			oipa_api_url: settings.oipa_api_url,
 			whatWeDoTotal: whatWeDoTotal,
 			top5CountryTotal: top5CountryTotal,
-			activiteProjectCount: activiteProjectCount,
+			activiteProjectCount: activiteProjectCount
  		}
 end
 
@@ -231,6 +232,13 @@ def getCacheData(fileName)
 	# Get a list of map markers
 	mapMarkers = getCountryMapMarkers(n)
   	settings.devtracker_page_title = 'Country ' + country['name'] + ' Summary Page'
+	json_link = ''
+	if request.url.start_with?('https://devtracker.')
+		json_link = json_link + settings.prod_api_url
+	else
+		json_link = json_link + settings.dev_api_url
+	end
+	json_link = json_link + '/search/activity/?q=recipient_country_code:'+n+' AND reporting_org_ref:GB-GOV-* AND hierarchy:1&format='
 	erb :'countries/country', 
 		:layout => :'layouts/layout',
 		:locals => {
@@ -242,7 +250,8 @@ def getCacheData(fileName)
  			countryGeoJsonData: geoJsonData,
 			mapMarkers: mapMarkers,
 			active_link: 'aidByLoc',
-			active_sub_link: 'countrySummary'
+			active_sub_link: 'countrySummary',
+			json_url_link: json_link
  		}
 end
 ## country summary page related api calls
@@ -422,6 +431,14 @@ def getCacheData(fileName)
 			end
 		end
 	end
+	if(!project['reporting_org_ref'].to_s == 'GB-GOV-1')
+		if(project.has_key?('activity_aggregation_incoming_funds_value_gbp'))
+			programmeBudget = programmeBudget + project['activity_aggregation_incoming_funds_value_gbp'].to_f
+		end
+		if(project.has_key?('activity_aggregation_commitment_value_gbp'))
+			programmeBudget = programmeBudget + project['activity_aggregation_commitment_value_gbp'].to_f
+		end
+	end
   	#get project sectorwise graph  data
   	projectSectorGraphData = get_project_sector_graph_datav2(n)
   	settings.devtracker_page_title = 'Programme '+project['iati_identifier']
@@ -834,7 +851,7 @@ def getCacheData(fileName)
 #  SOLR BASED PAGES
 #####################################################################
 
-get '/search/?' do
+get '/search_p/?' do
 	if (!params['query'])
 		query= ''
 		filters = []
@@ -878,7 +895,7 @@ def getCacheData(fileName)
 	}
 end
 
-post '/search/?' do
+post '/search_p/?' do
 	#query = params['query']
 	query = sanitize_input(params['query'],"newId")
 	isIncludeClosedProjects = sanitize_input(params['includeClosedProject'],"newId")

helpers/oipa_helpers.rb

@@ -9,7 +9,13 @@ def non_dfid_data(projectCode)
 
   def activityUrlOipa(projectCode,format)
    #settings.oipa_api_url + "activities/" + projectCode + "?format=" + format
-   "/api/activities/" + projectCode + "/?fields=all&format=" + format
+   u = ''
+   if request.url.start_with?('https://devtracker.')
+    u = u + settings.prod_api_url
+   else
+    u = u + settings.dev_api_url
+   end
+   u+"/search/activity/?q=iati_identifier:" + projectCode + "&fl=*&format=" + format
   end
 
 end

helpers/project_helpers.rb

@@ -1372,7 +1372,7 @@ def project_budget_per_fyv2(projectId)
 
             currentFinancialYear = financial_year
 
-            range = if series.size < 7 then
+            range = if series.size < 900 then
                         series
                     # if the last item in the list is less than or equal to 
                     # the current financial year get the last 6

views/countries/country.html.erb

@@ -126,8 +126,7 @@
                 <div class="govuk-grid-column-full">
                     <p class="govuk-!-font-size-16 govuk-!-font-weight-bold govuk-!-margin-top-0 govuk-!-margin-bottom-0">Download IATI Activity Data for <%= country['name']%></p>
                     <div class="app-download-data">
-                        <a href="https://iati.fcdo.gov.uk/iati_files/Country/FCDO-<%= country['name'].gsub(/ /,'-').gsub(/[()]/,"").gsub(/,/,"")%>-<%= country['code']%>.xml" class="govuk-link" target="_blank"><strong class="govuk-tag govuk-tag--blue">XML</strong></a>
-                        <a href="https://devtracker.fcdo.gov.uk/api/activities/?format=json&recipient_country=<%= country['code']%>&reporting_organisation_identifier=<%= settings.goverment_department_ids%>&page_size=<%= activityCount %>" class="govuk-link" target="_blank"><strong class="govuk-tag govuk-tag--blue">JSON</strong></a>
+                        <a href="<%= json_url_link%>json" class="govuk-link" target="_blank"><strong class="govuk-tag govuk-tag--blue">JSON</strong></a>
                     </div>
                 </div>
             </div>

views/index.html.erb

@@ -76,7 +76,7 @@ layout: cw_landing
                 <div id="event-name-hint" class="govuk-hint">
                     Enter location, sector, organisation or keyword
                 </div>
-                <form id="searchForm" action="/search" class="app-search-form" method="POST"  onsubmit="return validateSearch()">
+                <form id="searchForm" action="/search_p" class="app-search-form" method="POST"  onsubmit="return validateSearch()">
                     <p id="searchQueryError" class="govuk-error-message app-display-none">
                         <span class="govuk-visually-hidden">Error:</span> Please enter a search query
                     </p>

views/index2.html.erb

@@ -16,7 +16,7 @@ layout: landing
 <div class="row">
     <div class="twelve columns">
         <div id="search-bar">
-            <form action="/search" method="GET">
+            <form action="/search_p" method="GET">
                 <div class="row">
                     <div class="three columns">
                         <label for="query">

views/layouts/layout_forms.erb

@@ -153,7 +153,7 @@
       <div class="row">
         <div class="twelve columns">
           <h2><a href="/" title="Go to the homepage">Development Tracker</a></h2>
-          <form id="search" class="site-search" action="/search" method="GET" role="search">
+          <form id="search" class="site-search" action="/search_p" method="GET" role="search">
             <label for="site-search-text" class="visually-hidden">Search</label>
             <input type="search" name="query" id="site-search-text" title="Search"><input class="button" type="submit" value="Search">
             <input id="includeClosed" name="includeClosed" type="hidden" value="0">

views/new_layout/index.html.erb

@@ -13,7 +13,7 @@
                         <div id="event-name-hint" class="govuk-hint">
                             Enter location, sector, organisation or keyword
                         </div>
-                        <form action="/search" class="app-search-form" method="post" enctype="multipart/form-data">
+                        <form action="/search_p" class="app-search-form" method="post" enctype="multipart/form-data">
                             <div class="app-search-form__textbox">
                                 <input class="govuk-input" id="query" name="query" type="text">
                                 <button class="app-search-form__button" data-module="govuk-button"></button>

views/new_layout/layouts/landing.html.erb

@@ -37,7 +37,7 @@
         </div>
     </header>
 
-    <form action="/search" method="post" enctype="multipart/form-data">
+    <form action="/search_p" method="post" enctype="multipart/form-data">
         <div id="globalSearch" class="app-header__search app-element-hidden">
             <div class="govuk-width-container">
                 <div class="govuk-form-group">

views/new_layout/layouts/layout.html.erb

@@ -38,7 +38,7 @@
         </div>
     </header>
 
-    <form action="/search" method="post" enctype="multipart/form-data">
+    <form action="/search_p" method="post" enctype="multipart/form-data">
         <div id="globalSearch" class="app-header__search app-element-hidden">
             <div class="govuk-width-container">
                 <div class="govuk-form-group">