Merge pull request #33 from johnofsydney/bisalloy-additions

Bisalloy additions

app/services/file_ingestor.rb

@@ -244,7 +244,7 @@ def general_upload(file)
 
         title = if row['title'].present?
           CapitalizeNames.capitalize(row['title'].strip)
-                         .gsub(/\bCEO\b/i) { |word| word.titleize }
+                         .gsub(/\bCEO\b/i) { |word| word.upcase }
         end
 
         evidence = row['evidence'].strip if row['evidence'].present?

app/views/components/groups/person.rb

@@ -61,7 +61,11 @@ def last_position_and_title
     return '' unless result
 
     if position.end_date.present? && position.start_date.present?
-      result += " | (#{position.formatted_start_date} - #{position.formatted_end_date})"
+      if position.end_date == position.start_date
+        result += " | (#{position.formatted_start_date})"
+      else
+        result += " | (#{position.formatted_start_date} - #{position.formatted_end_date})"
+      end
     elsif position.start_date.present?
       result += " | (since #{position.formatted_start_date})"
     elsif position.end_date.present?

csv_data/affiliations-2024-11-15.csv

@@ -0,0 +1,4 @@
+group,member_group,start_date,end_date,evidence
+Turnbull & Partners Pty Ltd, Bisalloy Steel Group,,,https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Rafael Advanced Defense Systems, Varley Rafael,,,https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Rafael Advanced Defense Systems, Rafael Australia Pty Ltd,,,https://www.bisalloy.com.au/news/australias-bisalloy-appointed-to-rafaels-global-supply-chain-with-900000-contract/

csv_data/other_people_groups_positions-2024-11-14.csv

@@ -0,0 +1,29 @@
+group,person,title,start_date,end_date,evidence
+Turnbull & Partners Pty Ltd, Malcolm Turnbull, Director
+Turnbull & Partners Pty Ltd, Lucy Turnbull, Director
+Australia & Israel Arms Deal Agreed October 2017, Malcolm Turnbull, Australian Prime Minister, 2017-10-31, 2017-10-31, https://www.abc.net.au/news/2017-10-31/turnbull-meets-with-netanyahu/9101990
+Australia & Israel Arms Deal Agreed October 2017, Benjamin Netanyahu, Israeli Prime Minister, 2017-10-31, 2017-10-31, https://www.abc.net.au/news/2017-10-31/turnbull-meets-with-netanyahu/9101990
+Australian Diplomatic Service, Dave Sharma, Australian Ambassador to Israel, 2013-05-16, 2017-06-19, https://www.aph.gov.au/Senators_and_Members/Parliamentarian?MPID=274506
+Bisalloy Steel Group, Dave Sharma, Shareholder, , ,https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Bisalloy Steel Group, Peter Smaller, Shareholder, , ,https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Jewish National Fund Australia, Peter Smaller, Director
+Jewish Communal Appeal, David Balkin, Honorary Life Governor
+Anniversary Visit for The Battle of Beersheba, Malcolm Turnbull, Australian Prime Minister, 2017-10-31, 2017-10-31, https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Anniversary Visit for The Battle of Beersheba, Benjamin Netanyahu, Israeli Prime Minister, 2017-10-31, 2017-10-31, https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Anniversary Visit for The Battle of Beersheba, Peter Smaller, Attendee, 2017-10-31, 2017-10-31, https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Anniversary Visit for The Battle of Beersheba, David Balkin, Attendee, 2017-10-31, 2017-10-31, https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Anniversary Visit for The Battle of Beersheba, Lucy Turnbull, Attendee, 2017-10-31, 2017-10-31, https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Anniversary Visit for The Battle of Beersheba, Bill Shorten, Australian Leader of the Opposition, 2017-10-31, 2017-10-31, https://michaelwest.com.au/protests-as-malcolm-turnbull-backed-bisalloy-steel-sells-armour-to-the-idf/
+Christopher Pyne Visit to Israel, Christopher Pyne, Attendee, 2018-07-06, 2018-07-09, https://www.minister.defence.gov.au/media-releases/2018-07-06/visit-israel
+Bisalloy Steel Group, Justin Suwart, Business Manager - Armour,,,https://www.bisalloy.com.au/news/australias-bisalloy-appointed-to-rafaels-global-supply-chain-with-900000-contract/
+Rafael Australia Pty Ltd, Ido Spitzer, General Manager,,,https://www.bisalloy.com.au/news/australias-bisalloy-appointed-to-rafaels-global-supply-chain-with-900000-contract/
+Bisalloy Steel Group, David Balkin, Chairman,,,https://www.bisalloy.com.au/investor-centre/board-of-directors/
+Bisalloy Steel Group, Ian Greenyer, Director,,,https://www.bisalloy.com.au/investor-centre/board-of-directors/
+Bisalloy Steel Group, Michael Gundy, Director,,,https://www.bisalloy.com.au/investor-centre/board-of-directors/
+Bisalloy Steel Group, Bernie Landy, Director,,,https://www.bisalloy.com.au/investor-centre/board-of-directors/
+Bisalloy Steel Group, Rowan Melrose, Managing Director & CEO, 2022-03-01,,https://www.bisalloy.com.au/investor-centre/board-of-directors/, https://www.bisalloy.com.au/app/uploads/2022/08/17-Jan-Appointment-of-new-managing-director-CEO.pdf
+Bisalloy Steel Group, Greg Albert, Managing Director & CEO,,2022-03-01,https://www.bisalloy.com.au/news/prime-minister-visits-bisalloy-steels/
+Turnbull Family, Malcolm Turnbull, Husband / Father
+Turnbull Family, Lucy Turnbull, Wife / Mother
+Turnbull Family, Daisy Turnbull, Daughter
+Turnbull Family, Alexander Turnbull, Son

lib/tasks/add_records.rake

@@ -4,14 +4,16 @@ namespace :lester do
     # From a file created and maintained by me, whenever noteworthy people or groups appear in the news
     # COMPLETE
     # FileIngestor.general_upload('csv_data/other_people_groups_positions-2024-09-13.csv')
-    FileIngestor.general_upload('csv_data/other_people_groups_positions-2024-11-13.csv')
+    # FileIngestor.general_upload('csv_data/other_people_groups_positions-2024-11-13.csv')
+    FileIngestor.general_upload('csv_data/other_people_groups_positions-2024-11-14.csv')
 
 
     # From a file created and maintained by me, linking groups to groups, whenever information comes to light
     # COMPLETE
     # FileIngestor.affiliations_upload('csv_data/affiliations-2024-09-18.csv')
     # FileIngestor.affiliations_upload('csv_data/affiliations-2024-10-23.csv') - affiliations mostly for Australian Energy Producers
     # FileIngestor.affiliations_upload('csv_data/affiliations-2024-10-29.csv') # adding more categories
+    FileIngestor.affiliations_upload('csv_data/affiliations-2024-11-15.csv') # adding more categories
 
 
     # This is a reminder, to add more info on ministries.