diff --git a/app/assets/images/anzac/1_part_att_q.gif b/app/assets/images/anzac/1_part_att_q.gif deleted file mode 100644 index d6b55b06..00000000 Binary files a/app/assets/images/anzac/1_part_att_q.gif and /dev/null differ diff --git a/app/assets/images/anzac/att_chest_mesurement.gif b/app/assets/images/anzac/att_chest_mesurement.gif deleted file mode 100644 index f4543e8c..00000000 Binary files a/app/assets/images/anzac/att_chest_mesurement.gif and /dev/null differ diff --git a/app/assets/images/anzac/att_hearing.gif b/app/assets/images/anzac/att_hearing.gif deleted file mode 100644 index dc0d805e..00000000 Binary files a/app/assets/images/anzac/att_hearing.gif and /dev/null differ diff --git a/app/assets/images/anzac/att_height.gif b/app/assets/images/anzac/att_height.gif deleted file mode 100644 index 58fba8f9..00000000 Binary files a/app/assets/images/anzac/att_height.gif and /dev/null differ diff --git a/app/assets/images/anzac/att_sight.gif b/app/assets/images/anzac/att_sight.gif deleted file mode 100644 index 16e4e280..00000000 Binary files a/app/assets/images/anzac/att_sight.gif and /dev/null differ diff --git a/app/assets/images/anzac/background.png b/app/assets/images/anzac/background.png deleted file mode 100644 index 242a2d73..00000000 Binary files a/app/assets/images/anzac/background.png and /dev/null differ diff --git a/app/assets/images/anzac/hs_mark_help.gif b/app/assets/images/anzac/hs_mark_help.gif deleted file mode 100644 index 34abdc34..00000000 Binary files a/app/assets/images/anzac/hs_mark_help.gif and /dev/null differ diff --git a/app/assets/images/anzac/hs_transfer_row.gif b/app/assets/images/anzac/hs_transfer_row.gif deleted file mode 100644 index b2d28b38..00000000 Binary files a/app/assets/images/anzac/hs_transfer_row.gif and /dev/null differ diff --git a/app/assets/images/anzac/logo.png b/app/assets/images/anzac/logo.png deleted file mode 100644 index 821cacfa..00000000 Binary files a/app/assets/images/anzac/logo.png and /dev/null differ diff --git a/app/assets/images/anzac/logo.svg b/app/assets/images/anzac/logo.svg deleted file mode 100644 index eeba747f..00000000 --- a/app/assets/images/anzac/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/images/anzac/sa_att_ex.jpeg b/app/assets/images/anzac/sa_att_ex.jpeg deleted file mode 100644 index 04dcd321..00000000 Binary files a/app/assets/images/anzac/sa_att_ex.jpeg and /dev/null differ diff --git a/app/assets/javascripts/components/mark/index.cjsx b/app/assets/javascripts/components/mark/index.cjsx index 2355d181..a59c71f0 100644 --- a/app/assets/javascripts/components/mark/index.cjsx +++ b/app/assets/javascripts/components/mark/index.cjsx @@ -57,6 +57,7 @@ module.exports = React.createClass # rename to Classifier componentDidMount: -> @getCompletionAssessmentTask() @fetchSubjectSetsBasedOnProps() + @fetchGroups() componentWillMount: -> @setState taskKey: @getActiveWorkflow().first_task @@ -285,6 +286,13 @@ module.exports = React.createClass # rename to Classifier

} + { + if @getActiveWorkflow()? and @state.groups?.length > 1 +

+ About this {@props.project.term('group')}. +

+ } +
diff --git a/app/assets/javascripts/lib/fetch-subject-sets-mixin.cjsx b/app/assets/javascripts/lib/fetch-subject-sets-mixin.cjsx index e2137659..f2073002 100644 --- a/app/assets/javascripts/lib/fetch-subject-sets-mixin.cjsx +++ b/app/assets/javascripts/lib/fetch-subject-sets-mixin.cjsx @@ -2,6 +2,20 @@ API = require './api' module.exports = + fetchGroups: -> + API.type("groups").get(project_id: @props.project.id).then (groups)=> + + # set page to current bookmark, if exists + if @props.user?.subject_set_bookmarks[@getCurrentSubjectSet()?.id]? + page = @props.user.subject_set_bookmarks[@getCurrentSubjectSet().id] + + group.showButtons = false for group in groups # hide buttons by default + @setState + groups: groups + subject_index: page-1 || 0 + , => + console.log 'SKIPPING TO PAGE: ', @state.subject_index + 1 + fetchSubjectSetsBasedOnProps: -> # Establish a callback for after subjects are fetched - to apply additional state changes: @@ -32,8 +46,6 @@ module.exports = group_id: @props.query.group_id ? null @fetchSubjectSets params, postFetchCallback - - # this method fetches the next page of subjects in a given subject_set. # right now the trigger for this method is the forward or back button in the light-box # I am torn about whether to set the subject_index at this point? -- AMS diff --git a/app/assets/javascripts/lib/fetch-subjects-mixin.cjsx b/app/assets/javascripts/lib/fetch-subjects-mixin.cjsx index a544291d..7b9e19a4 100644 --- a/app/assets/javascripts/lib/fetch-subjects-mixin.cjsx +++ b/app/assets/javascripts/lib/fetch-subjects-mixin.cjsx @@ -54,4 +54,3 @@ module.exports = # Does including instance have a defined callback to call when new subjects received? if @fetchSubjectsCallback? @fetchSubjectsCallback() - diff --git a/app/assets/javascripts/lib/workflow-methods-mixin.cjsx b/app/assets/javascripts/lib/workflow-methods-mixin.cjsx index 7998878b..d0d6723a 100644 --- a/app/assets/javascripts/lib/workflow-methods-mixin.cjsx +++ b/app/assets/javascripts/lib/workflow-methods-mixin.cjsx @@ -107,7 +107,7 @@ module.exports = @forceUpdate() window.classifications = @state.classifications # make accessible to console callback() if callback? - + @commitClassification(classification) toggleBadSubject: (e, callback) -> diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fd54fa38..2d072c73 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,7 +3,7 @@ class UsersController < ApplicationController def logged_in_user providers = User.auth_providers - + respond_with AuthStateSerializer.new(user: current_or_guest_user, providers: providers) end diff --git a/app/models/classification.rb b/app/models/classification.rb index e346995a..adf43a95 100644 --- a/app/models/classification.rb +++ b/app/models/classification.rb @@ -19,8 +19,10 @@ class Classification after_create :increment_subject_classification_count #, :check_for_retirement_by_classification_count after_create :generate_new_subjects after_create :generate_terms + after_create :place_bookmark # save subject_set id and page number to user model + # removing this after create until we have a use case for the information - # after_create :increment_subject_set_classification_count, + # after_create :increment_subject_set_classification_count, scope :by_child_subject, -> (id) { where(child_subject_id: id) } scope :having_child_subjects, -> { where(:child_subject_id.nin => ['', nil]) } @@ -73,6 +75,11 @@ def generate_terms end end + def place_bookmark + return if self.subject.subject_set_id.nil? || self.subject.order.nil? + user.place_bookmark(self.subject.subject_set_id,self.subject.order) + end + # removing this from the after_create hook in interest of speed. 10/22/15 def increment_subject_set_classification_count subject.subject_set.inc classification_count: 1 @@ -97,7 +104,7 @@ def increment_subject_classification_count # subject.inc classification_count: 1 # Push user_id onto Subject.user_ids using mongo's fast addToSet feature, which ensures uniqueness subject_returned = Subject.where({id: subject_id}).find_and_modify({"$addToSet" => {classifying_user_ids: user_id.to_s}, "$inc" => {classification_count: 1}}, new: true) - + #Passing the returned subject as parameters so that we eval the correct classification_count check_for_retirement_by_classification_count(subject_returned) end diff --git a/app/models/user.rb b/app/models/user.rb index e429fe80..c326a42e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,4 @@ -class User +class User include Mongoid::Document include Mongoid::Timestamps # Include default devise modules. Others available are: @@ -34,12 +34,15 @@ class User field :avatar, :type => String # URI of image if any field :profile_url, :type => String # URI of user profile, if any - + field :status, :type => String, :default => 'active' field :role, :type => String, :default => 'user' # user, admin, team field :guest, :type => Boolean, :default => false field :tutorial_complete, :type => Boolean, :default => false + # for remembering users' last viewed subject + field :subject_set_bookmarks, :type => Hash, :default => {} + has_many :favourites has_many :classifications @@ -62,6 +65,12 @@ def tutorial_complete! self.save!(:validate => false) end + def place_bookmark(subject_set_id,page) + subject_set_id = subject_set_id.to_s + self.subject_set_bookmarks[subject_set_id] = page + save!(:validate => false) + end + def has_favourite?(subject) favourites.where( subject_id: subject.id ).exists? end @@ -82,8 +91,8 @@ def to_s name end - # Steal all the contributions of the given user (e.g. visitor made some - # contribs as a guest, then logged in with a real acct and we want to + # Steal all the contributions of the given user (e.g. visitor made some + # contribs as a guest, then logged in with a real acct and we want to # transfer the guest contribs to the real acct def steal_contributions(other_user) [:classifications, :favourites].each do |relation| @@ -176,7 +185,7 @@ def self.details_from_zooniverse(access_token) provider: access_token["provider"] } end - + def self.create_guest_user u = create({ name: 'Guest', diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index d6475746..07a62bbd 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -1,7 +1,7 @@ class UserSerializer < ActiveModel::MongoidSerializer root false - attributes :id, :guest, :name, :avatar, :tutorial_complete + attributes :id, :guest, :name, :avatar, :tutorial_complete, :subject_set_bookmarks def id object._id.to_s diff --git a/config/routes.rb b/config/routes.rb index 89c4d67b..5b783df9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,24 +14,25 @@ get '/current_user', to: "users#logged_in_user" post '/tutorial_complete', to: "users#tutorial_complete" - + post '/subject_set_bookmarks', to: "users#subject_set_bookmarks" + get '/projects/stats', to: 'projects#stats' get '/workflows/:workflow_id/subjects', to: 'subjects#index' get '/workflows/:workflow_id/subject_sets', to: 'subject_sets#index' - + # Subjects get '/subjects/:subject_id', to: 'subjects#show', defaults: { format: 'json' } get '/subjects', to: 'subjects#index', defaults: { format: 'json' } get '/workflows/:workflow_id/subject_sets/:subject_set_id/subjects/:subject_id', to: 'subject_sets#show', defaults: { format: 'json' } - + # Subject_sets resources :subject_sets, only: [:show, :index], :defaults => { :format => 'json' } # we are using the _url helper for show, so opting to keep this as resources for now get '/subject_sets/terms/:field', to: 'subject_sets#name_search' - + # Classifications get '/classifications/terms/:workflow_id/:annotation_key', to: 'classifications#terms' - post '/classifications', to: 'classifications#create' + post '/classifications', to: 'classifications#create' resources :groups, only: [:show, :index], :defaults => { :format => 'json' } @@ -43,5 +44,5 @@ get 'signin' => 'auth#signin' end get 'admin' => 'admin/dashboard#index' - + end diff --git a/project/whale_tales/assets/images/Rob_Allan.JPG b/project/whale_tales/assets/images/Rob_Allan.jpg similarity index 100% rename from project/whale_tales/assets/images/Rob_Allan.JPG rename to project/whale_tales/assets/images/Rob_Allan.jpg diff --git a/project/whale_tales/content/help/weather.md b/project/whale_tales/content/help/weather.md index 0c8638be..d4379519 100644 --- a/project/whale_tales/content/help/weather.md +++ b/project/whale_tales/content/help/weather.md @@ -3,7 +3,7 @@ Select the type of weather description, then draw a rectangle around each locati Wind force (speed) and direction and an impression of the weather are found in most every log entry. -![Illustration of a compass card](assets/whale_tales/compass.jpg) +![Illustration of a compass card](images/compass.jpg) -Force descriptions are indexed to the [Beaufort Scale](http://www.spc.noaa.gov/faq/tornado/beaufort.html) +Force descriptions are indexed to the Beaufort Scale and direction is given in compass points (N, NW, NxW, NNW for example). Measurements of temperature and barometric pressure are rare in these logs, so please be sure to mark them if you find them! diff --git a/project/whale_tales/content/home.html.erb b/project/whale_tales/content/home.html.erb index d4075444..f5a79210 100644 --- a/project/whale_tales/content/home.html.erb +++ b/project/whale_tales/content/home.html.erb @@ -19,7 +19,7 @@
- Check out other Old Weather projects ➢ + Check out other Old Weather projects ➢
diff --git a/project/whale_tales/content/team.html.erb b/project/whale_tales/content/team.html.erb index 16d98fd5..25f894a4 100644 --- a/project/whale_tales/content/team.html.erb +++ b/project/whale_tales/content/team.html.erb @@ -2,49 +2,51 @@
- +

**Rob Allan** is based at the Met Office Hadley Centre where he leads the international Atmospheric Circulation Reconstructions of the Earth (ACRE) initiative (http://www.met-acre.org). Old Weather is a part of the international outreach arm of ACRE.

 - +

**Philip Brohan** is a climate scientist at the Met Office Hadley Centre, where he tries to combine information from old documents, tree-rings and large computers, into a clear picture of what the weather used to be like.

 - +

**Gil Compo** is a climate scientist leading the 20th Century Reanalysis Project at the Cooperative Institute for Research in the Environmental Sciences of the University of Colorado at Boulder and is an affiliate of the NOAA Earth System Research Laboratory. He has a blast using supercomputers to reconstruct the weather from the surface of the earth to the level of the jet stream as far back as Old Weather can go.

 - +

**Michael Lapides** is the Director of Digital Initiatives at the New Bedford Whaling Museum and leads the logbook digitization effort for Old Weather - Whaling.

 - +

**Mark Mollan** is an archivist in the Navy/Maritime section of the U.S. National Archives and coordinates Old Weather project activities at the Archives.

 - +

**Mark Procknik** is the Librarian at the New Bedford Whaling Museum and provides access to primary sources at the Research Library.

 - +

**Gordon Smith**, a one-time engineer, military operations analyst and human relations manager, lost his father in action at sea in 1943. Wanting to discover more, he wrote a couple of naval history books in his 40's and then started Naval-History.net to help others do the same. Long-retired, he loves sailing.

 - +

**Clive Wilkinson** is research manager for the Recovery of Logbooks and International Marine Data (RECLAIM) Project (http://icoads.noaa.gov/reclaim), a part of NOAA's Climate Database Modernisation Program. He is based at the Climatic Research Unit at the University of East Anglia.

 - +

**Kevin Wood**, U.S. Old Weather - Arctic lead investigator, is a climate scientist at the NOAA – University of Washington Joint Institute for the Study of the Atmosphere and Ocean.

 +

This project was built by Sascha Ishikawa (Zooniverse/Adler Planetarium) using [Scribe](http://scribe.nypl.org), a framework for crowdsourcing the transcription of text-based documents.

+
diff --git a/project/whale_tales/project.json b/project/whale_tales/project.json index 438f2e05..3ee477aa 100644 --- a/project/whale_tales/project.json +++ b/project/whale_tales/project.json @@ -20,8 +20,7 @@ "feedback_form_url": "https://docs.google.com/forms/d/12FTryz5oTuzJE-UtbuMYCH5M77lLo-H74wiN35ORc8U/viewform", "terms_map": { "group": "ship", - "subject set": "logbook", + "subject set": "page", "subject": "page" } - } diff --git a/project/whale_tales/subjects/groups.csv b/project/whale_tales/subjects/groups.csv index 17c32712..568be39c 100644 --- a/project/whale_tales/subjects/groups.csv +++ b/project/whale_tales/subjects/groups.csv @@ -1,2 +1,23 @@ order,key,name,mss_number,date_span,description,external_url,cover_image_url -1,congress_short,Congress 1864,KWM 55,"May 31, 1864 - May 15, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by John A. Castino, on voyage from May 31, 1864 - May 13, 1867; owner-agent: Edward C. Jones; built at Mattapoisett, Massachusetts, 1823; formerly of the Nantucket fleet; sold to New Bedford in 1843.",http://www.whalingmuseum.org/explore/library/logbooks/congress-kwm_55,http://whaling-data.oldweather.org/images/placeholder.jpg +1,congress,Congress 1864,KWM 55,"May 31, 1864 - May 15, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by John A. Castino, on voyage from May 31, 1864 - May 13, 1867; owner-agent: Edward C. Jones; built at Mattapoisett, Massachusetts, 1823; formerly of the Nantucket fleet; sold to New Bedford in 1843.",http://www.whalingmuseum.org/explore/library/logbooks/congress-kwm_55,http://whaling-data.oldweather.org/images/placeholder.jpg +2,eliza_adams,Eliza Adams 1863,KWM 74,"October 19, 1863 - April 22, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by Coddington P. Fish and then John Keenan (Captain Fish became inn in Hawaii and first mate John Keene was appointed relief master, Nov. 1866), on voyage from October 20, 1863 - April 22, 1867; owner-agent: Edward C. Jones; built at Fairhaven, Mass., 1835; abandoned 1879.",http://www.whalingmuseum.org/explore/library/logbooks/eliza_adams-kwm_74,http://whaling-data.oldweather.org/images/Eliza_Adams_KWM74.jpg +3,horatio,Horatio 1896,KWM 104,"March 17, 1896 - November 1, 1896",,http://www.whalingmuseum.org/explore/library/logbooks/digitized-logbook-horatio-kwm_104,http://whaling-data.oldweather.org/images/Horatio_KWM104.jpg +4,milo,Milo 1863,KWM 147,"November 26, 1863 - April 2, 1868","Whaling vessel, out of New Bedford, Mass., mastered by Jonathan Capen Hawes, on voyage from November 26, 1863 - May 7, 1869; owner-agent: E.C. Jones; built at Newburyport in 1811; captured and bonded by the Shenandoah, 1865; sold out, 1872.",http://www.whalingmuseum.org/explore/library/logbooks/milo-kwm_147,http://whaling-data.oldweather.org/images/Milo_rightmost_ODHS_147.jpg +5,saratoga,Saratoga 1857,KWM 180,"April 23, 1857 - December 12, 1858","Whaling vessel, out of New Bedford, Massachusetts, mastered by Frederick Slocum, on voyage from November 3, 1856 - June 1, 1860; owner-agent: Abraham Ashley; built at New York, N.Y., 1832.",http://www.whalingmuseum.org/explore/library/logbooks/saratoga-kwm_180,http://whaling-data.oldweather.org/images/Saratoga_KWM180.jpg +6,trident,Trident 1869,KWM 192,"December 10, 1869 - November 4, 1870","Whaling vessel, out of New Bedford, Mass., mastered by Samuel Green, on voyage from November 16, 1869 - June 10, 1871; owner-agent: Swift & Perry; built at New York, N.Y., 1824.",http://www.whalingmuseum.org/explore/library/logbooks/trident-kwm_192,http://whaling-data.oldweather.org/images/placeholder.jpg +7,betsey_williams,Betsey Williams 1851,KWM 370,"July 23, 1851 - April 20, 1854","Whaling vessel, out of Stonington, Connecticut, mastered by Gilbert Pendleton Jr., on voyage July 24, 1851 - April 20, 1854 to the River Plate, Coast of Chile, Juan Fernandez, Off Shore, Hawaiian Islands, Northwest Coast, Anadyr Sea, and Arctic Ocean whaling grounds; owner-agent: Charles Phelps Williams.",http://www.whalingmuseum.org/explore/library/logbooks/betsey_williams-kwm_370,http://whaling-data.oldweather.org/images/placeholder.jpg +8,helen_snow,Helen Snow 1871,ODHS 6,"October 17, 1871 - August 21, 1872","Whaling vessel (ca. 215 tons), out of New Bedford, Mass., mastered by George H. Macomber, on voyage October 17, 1871 - August 19, 1872 (abandoned in Arctic); owner-agent: Loum Snow & Son; built at Bath, Me., 1851.",http://www.whalingmuseum.org/explore/library/logbooks/helen_snow-odhs_6,http://whaling-data.oldweather.org/images/Helen_Snow_ODHS_6.jpg +9,seneca,Seneca 1869,ODHS 7,"October 16, 1869 - September 14, 1871","Whaling vessel (ca. 328 tons), out of New Bedford, Mass., mastered by Edmund Kelley, on voyage October 16, 1869 - September 14, 1871; owner-agent: Loum Snow & Son, built at Baltimore, Md., 1847, bought from Baltimore and rebuilt at New Bedford, 1869.",http://www.whalingmuseum.org/explore/library/logbooks/seneca-odhs_7,http://whaling-data.oldweather.org/images/placeholder.jpg +10,rosario,Rosario 1891,ODHS 654B,"March 24, 1891 - October 3, 1891","Whaling vessel, out of San Francisco, California, mastered by Edward Coffin, on voyage from March 24, 1891 - November 6, 1891; owner-agent: Bowne Wright.",http://www.whalingmuseum.org/explore/library/logbooks/rosario-odhs_654B,http://whaling-data.oldweather.org/images/Rosario_ODHS_654B.jpg +11,john_wells,John Wells 1869,ODHS 769,"November 9, 1869 - November 11, 1871","Whaling vessel, out of New Bedford Massachusetts, mastered by Aaron Dean, on voyage Novemebr 9, 1869 - September 12, 1871; owner-agent: William O. Brownell; built at New York, N.Y., 1822; altered from a ship in 1857; lost in the Arctic 1871 (this voyage).",http://www.whalingmuseum.org/explore/library/logbooks/john_wells-odhs_769,http://whaling-data.oldweather.org/images/John_Wells_leftmost_ship_ODHS_769.jpg +12,progress,Progress ,ODHS 938B,,"Whaling vessel, out of San Francisco, California, on voyage December 16, 1880 - May 28, 1881 to the Off Shore, On the Line, and Western Arctic whaling grounds, mastered by Frederick A. Barker; owner-agent: I.H. Bartlett & Sons.",,http://whaling-data.oldweather.org/images/Progress_ODHS_938B.jpg +13,grampus_1,Grampus 1888,ODHS 948A,"February 11, 1888 - November 5, 1888","Whaling vessel, out of San Francisco, California, mastered by Henry G. Dexter, on voyage February 11, 1888 - November 5, 1888, to the Arctic Ocean whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at East Boston, Massachusetts, 1874.",http://www.whalingmuseum.org/explore/library/logbooks/grampus-odhs_948A,http://whaling-data.oldweather.org/images/Grampus_ODHS948.jpg +14,grampus_2,Grampus 1889,ODHS 948B,"February 26, 1889 - November 12, 1889","Whaling vessel, out of San Francisco, California, mastered by Henry G. Dexter, on voyage February 26, 1889 - November 12, 1889 to the Arctic Ocean whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at East Boston, Massachusetts, 1874.",http://www.whalingmuseum.org/explore/library/logbooks/grampus-odhs_948B,http://whaling-data.oldweather.org/images/Grampus_ODHS948.jpg +15,mary_hume,Mary D. Hume 1890,ODHS 949,"April 19, 1890 - September 30, 1892","Whaling vessel, out of San Francisco, Calif., mastered by James A. Tilton, on voyage April 19, 1890 - September 29, 1892 to the Herschel Island whaling grounds; owner-agent: Josiah N. Knowles; built at Ellensburg, Oregon, 1881.",http://www.whalingmuseum.org/explore/library/logbooks/mary_d_hume-odhs_949,http://whaling-data.oldweather.org/images/Mary_D_Hume_ODHS_949.jpg +16,newport,Newport 1893,ODHS 950,"August 21, 1893 - September 4, 1896","Whaling vessel, out of San Francisco, Calif., mastered by William P. Porter, James Tilton, Hartson H. Bodfish and G.B. Levitt, on whaling voyaged from 1 June 1892-26 Sept. 1898, to the Herschel Island, 20/24, and Fathom whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at San Francisco, Calif., 1875.",http://www.whalingmuseum.org/explore/library/logbooks/newport-odhs_950,http://whaling-data.oldweather.org/images/Newport_ODHS_950.jpg +17,beluga,Beluga 1897,ODHS 951A,"March 30, 1897 - August 31, 1898","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 30, 1897 - March 4, 1899 to the Fathom whaling ground; owner-agent: Edwin L. Griffith; built at Bath, Maine, 1882.",http://www.whalingmuseum.org/explore/library/logbooks/beluga-odhs_951A,http://whaling-data.oldweather.org/images/Beluga_ODHS951.jpg +18,william_baylies_1,William Baylies 1905,ODHS 955,"March 1, 1905 - November 3, 1905","Whaling vessel, out of San Francisco, California, mastered by Hartson Hartlett Bodfish, on voyage from March 1, 1905 - November 3, 1905; owner-agent: William Lewis & Son; built at Bath, Maine in 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_955,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg +19,william_baylies_2,William Baylies 1906,ODHS 956A,"March 10, 1906 - November 6, 1906","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 10, 1906 - November 7, 1906 to the Northwest Coast whaling grounds; owner-agent: William Lewis & Son; built at Bath, Maine, 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_956A,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg +20,william_baylies_3,William Baylies 1907,ODHS 956B,"March 10, 1907 - November 7, 1907","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 11, 1907 - November 8, 1907, to the Artic Ocean whaling grounds; owner-agent: William Lewis & Son; built at Bath, Maine, 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_956B,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg +21,herman_1,Herman 1910,ODHS 958,"May 1, 1910 - October 25, 1910","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from April 30, 1910 - November 2, 1910, to the Artcic whaling grounds; owner-agent: H. Liebes & Co.; built at Bath, Maine, 1884.",http://www.whalingmuseum.org/explore/library/logbooks/herman-odhs_958,http://whaling-data.oldweather.org/images/Herman_ODHS958.jpg +22,herman_2,Herman 1911,ODHS 959,"March 22, 1911 - November 9, 1911","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 22, 1911 - November 10, 1911 to the Artcic whaling grounds; owner-agent: H. Liebes & Co.; built at Bath, Maine, 1884.",http://www.whalingmuseum.org/explore/library/logbooks/herman-odhs_959,http://whaling-data.oldweather.org/images/Herman_ODHS958.jpg diff --git a/project/whale_tales/subjects/groups_complete.csv b/project/whale_tales/subjects/groups_complete.csv deleted file mode 100644 index 568be39c..00000000 --- a/project/whale_tales/subjects/groups_complete.csv +++ /dev/null @@ -1,23 +0,0 @@ -order,key,name,mss_number,date_span,description,external_url,cover_image_url -1,congress,Congress 1864,KWM 55,"May 31, 1864 - May 15, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by John A. Castino, on voyage from May 31, 1864 - May 13, 1867; owner-agent: Edward C. Jones; built at Mattapoisett, Massachusetts, 1823; formerly of the Nantucket fleet; sold to New Bedford in 1843.",http://www.whalingmuseum.org/explore/library/logbooks/congress-kwm_55,http://whaling-data.oldweather.org/images/placeholder.jpg -2,eliza_adams,Eliza Adams 1863,KWM 74,"October 19, 1863 - April 22, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by Coddington P. Fish and then John Keenan (Captain Fish became inn in Hawaii and first mate John Keene was appointed relief master, Nov. 1866), on voyage from October 20, 1863 - April 22, 1867; owner-agent: Edward C. Jones; built at Fairhaven, Mass., 1835; abandoned 1879.",http://www.whalingmuseum.org/explore/library/logbooks/eliza_adams-kwm_74,http://whaling-data.oldweather.org/images/Eliza_Adams_KWM74.jpg -3,horatio,Horatio 1896,KWM 104,"March 17, 1896 - November 1, 1896",,http://www.whalingmuseum.org/explore/library/logbooks/digitized-logbook-horatio-kwm_104,http://whaling-data.oldweather.org/images/Horatio_KWM104.jpg -4,milo,Milo 1863,KWM 147,"November 26, 1863 - April 2, 1868","Whaling vessel, out of New Bedford, Mass., mastered by Jonathan Capen Hawes, on voyage from November 26, 1863 - May 7, 1869; owner-agent: E.C. Jones; built at Newburyport in 1811; captured and bonded by the Shenandoah, 1865; sold out, 1872.",http://www.whalingmuseum.org/explore/library/logbooks/milo-kwm_147,http://whaling-data.oldweather.org/images/Milo_rightmost_ODHS_147.jpg -5,saratoga,Saratoga 1857,KWM 180,"April 23, 1857 - December 12, 1858","Whaling vessel, out of New Bedford, Massachusetts, mastered by Frederick Slocum, on voyage from November 3, 1856 - June 1, 1860; owner-agent: Abraham Ashley; built at New York, N.Y., 1832.",http://www.whalingmuseum.org/explore/library/logbooks/saratoga-kwm_180,http://whaling-data.oldweather.org/images/Saratoga_KWM180.jpg -6,trident,Trident 1869,KWM 192,"December 10, 1869 - November 4, 1870","Whaling vessel, out of New Bedford, Mass., mastered by Samuel Green, on voyage from November 16, 1869 - June 10, 1871; owner-agent: Swift & Perry; built at New York, N.Y., 1824.",http://www.whalingmuseum.org/explore/library/logbooks/trident-kwm_192,http://whaling-data.oldweather.org/images/placeholder.jpg -7,betsey_williams,Betsey Williams 1851,KWM 370,"July 23, 1851 - April 20, 1854","Whaling vessel, out of Stonington, Connecticut, mastered by Gilbert Pendleton Jr., on voyage July 24, 1851 - April 20, 1854 to the River Plate, Coast of Chile, Juan Fernandez, Off Shore, Hawaiian Islands, Northwest Coast, Anadyr Sea, and Arctic Ocean whaling grounds; owner-agent: Charles Phelps Williams.",http://www.whalingmuseum.org/explore/library/logbooks/betsey_williams-kwm_370,http://whaling-data.oldweather.org/images/placeholder.jpg -8,helen_snow,Helen Snow 1871,ODHS 6,"October 17, 1871 - August 21, 1872","Whaling vessel (ca. 215 tons), out of New Bedford, Mass., mastered by George H. Macomber, on voyage October 17, 1871 - August 19, 1872 (abandoned in Arctic); owner-agent: Loum Snow & Son; built at Bath, Me., 1851.",http://www.whalingmuseum.org/explore/library/logbooks/helen_snow-odhs_6,http://whaling-data.oldweather.org/images/Helen_Snow_ODHS_6.jpg -9,seneca,Seneca 1869,ODHS 7,"October 16, 1869 - September 14, 1871","Whaling vessel (ca. 328 tons), out of New Bedford, Mass., mastered by Edmund Kelley, on voyage October 16, 1869 - September 14, 1871; owner-agent: Loum Snow & Son, built at Baltimore, Md., 1847, bought from Baltimore and rebuilt at New Bedford, 1869.",http://www.whalingmuseum.org/explore/library/logbooks/seneca-odhs_7,http://whaling-data.oldweather.org/images/placeholder.jpg -10,rosario,Rosario 1891,ODHS 654B,"March 24, 1891 - October 3, 1891","Whaling vessel, out of San Francisco, California, mastered by Edward Coffin, on voyage from March 24, 1891 - November 6, 1891; owner-agent: Bowne Wright.",http://www.whalingmuseum.org/explore/library/logbooks/rosario-odhs_654B,http://whaling-data.oldweather.org/images/Rosario_ODHS_654B.jpg -11,john_wells,John Wells 1869,ODHS 769,"November 9, 1869 - November 11, 1871","Whaling vessel, out of New Bedford Massachusetts, mastered by Aaron Dean, on voyage Novemebr 9, 1869 - September 12, 1871; owner-agent: William O. Brownell; built at New York, N.Y., 1822; altered from a ship in 1857; lost in the Arctic 1871 (this voyage).",http://www.whalingmuseum.org/explore/library/logbooks/john_wells-odhs_769,http://whaling-data.oldweather.org/images/John_Wells_leftmost_ship_ODHS_769.jpg -12,progress,Progress ,ODHS 938B,,"Whaling vessel, out of San Francisco, California, on voyage December 16, 1880 - May 28, 1881 to the Off Shore, On the Line, and Western Arctic whaling grounds, mastered by Frederick A. Barker; owner-agent: I.H. Bartlett & Sons.",,http://whaling-data.oldweather.org/images/Progress_ODHS_938B.jpg -13,grampus_1,Grampus 1888,ODHS 948A,"February 11, 1888 - November 5, 1888","Whaling vessel, out of San Francisco, California, mastered by Henry G. Dexter, on voyage February 11, 1888 - November 5, 1888, to the Arctic Ocean whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at East Boston, Massachusetts, 1874.",http://www.whalingmuseum.org/explore/library/logbooks/grampus-odhs_948A,http://whaling-data.oldweather.org/images/Grampus_ODHS948.jpg -14,grampus_2,Grampus 1889,ODHS 948B,"February 26, 1889 - November 12, 1889","Whaling vessel, out of San Francisco, California, mastered by Henry G. Dexter, on voyage February 26, 1889 - November 12, 1889 to the Arctic Ocean whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at East Boston, Massachusetts, 1874.",http://www.whalingmuseum.org/explore/library/logbooks/grampus-odhs_948B,http://whaling-data.oldweather.org/images/Grampus_ODHS948.jpg -15,mary_hume,Mary D. Hume 1890,ODHS 949,"April 19, 1890 - September 30, 1892","Whaling vessel, out of San Francisco, Calif., mastered by James A. Tilton, on voyage April 19, 1890 - September 29, 1892 to the Herschel Island whaling grounds; owner-agent: Josiah N. Knowles; built at Ellensburg, Oregon, 1881.",http://www.whalingmuseum.org/explore/library/logbooks/mary_d_hume-odhs_949,http://whaling-data.oldweather.org/images/Mary_D_Hume_ODHS_949.jpg -16,newport,Newport 1893,ODHS 950,"August 21, 1893 - September 4, 1896","Whaling vessel, out of San Francisco, Calif., mastered by William P. Porter, James Tilton, Hartson H. Bodfish and G.B. Levitt, on whaling voyaged from 1 June 1892-26 Sept. 1898, to the Herschel Island, 20/24, and Fathom whaling grounds; owner-agent: Pacific Steam Whaling Co.; built at San Francisco, Calif., 1875.",http://www.whalingmuseum.org/explore/library/logbooks/newport-odhs_950,http://whaling-data.oldweather.org/images/Newport_ODHS_950.jpg -17,beluga,Beluga 1897,ODHS 951A,"March 30, 1897 - August 31, 1898","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 30, 1897 - March 4, 1899 to the Fathom whaling ground; owner-agent: Edwin L. Griffith; built at Bath, Maine, 1882.",http://www.whalingmuseum.org/explore/library/logbooks/beluga-odhs_951A,http://whaling-data.oldweather.org/images/Beluga_ODHS951.jpg -18,william_baylies_1,William Baylies 1905,ODHS 955,"March 1, 1905 - November 3, 1905","Whaling vessel, out of San Francisco, California, mastered by Hartson Hartlett Bodfish, on voyage from March 1, 1905 - November 3, 1905; owner-agent: William Lewis & Son; built at Bath, Maine in 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_955,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg -19,william_baylies_2,William Baylies 1906,ODHS 956A,"March 10, 1906 - November 6, 1906","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 10, 1906 - November 7, 1906 to the Northwest Coast whaling grounds; owner-agent: William Lewis & Son; built at Bath, Maine, 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_956A,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg -20,william_baylies_3,William Baylies 1907,ODHS 956B,"March 10, 1907 - November 7, 1907","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 11, 1907 - November 8, 1907, to the Artic Ocean whaling grounds; owner-agent: William Lewis & Son; built at Bath, Maine, 1886.",http://www.whalingmuseum.org/explore/library/logbooks/william_baylies-odhs_956B,http://whaling-data.oldweather.org/images/William_Baylies_ODHS955.jpg -21,herman_1,Herman 1910,ODHS 958,"May 1, 1910 - October 25, 1910","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from April 30, 1910 - November 2, 1910, to the Artcic whaling grounds; owner-agent: H. Liebes & Co.; built at Bath, Maine, 1884.",http://www.whalingmuseum.org/explore/library/logbooks/herman-odhs_958,http://whaling-data.oldweather.org/images/Herman_ODHS958.jpg -22,herman_2,Herman 1911,ODHS 959,"March 22, 1911 - November 9, 1911","Whaling vessel, out of San Francisco, California, mastered by Hartson H. Bodfish, on voyage from March 22, 1911 - November 10, 1911 to the Artcic whaling grounds; owner-agent: H. Liebes & Co.; built at Bath, Maine, 1884.",http://www.whalingmuseum.org/explore/library/logbooks/herman-odhs_959,http://whaling-data.oldweather.org/images/Herman_ODHS958.jpg diff --git a/project/whale_tales/subjects/groups_short.csv b/project/whale_tales/subjects/groups_short.csv new file mode 100644 index 00000000..17c32712 --- /dev/null +++ b/project/whale_tales/subjects/groups_short.csv @@ -0,0 +1,2 @@ +order,key,name,mss_number,date_span,description,external_url,cover_image_url +1,congress_short,Congress 1864,KWM 55,"May 31, 1864 - May 15, 1867","Whaling vessel, out of New Bedford, Massachusetts, mastered by John A. Castino, on voyage from May 31, 1864 - May 13, 1867; owner-agent: Edward C. Jones; built at Mattapoisett, Massachusetts, 1823; formerly of the Nantucket fleet; sold to New Bedford in 1843.",http://www.whalingmuseum.org/explore/library/logbooks/congress-kwm_55,http://whaling-data.oldweather.org/images/placeholder.jpg diff --git a/project/whale_tales/workflows/mark.json b/project/whale_tales/workflows/mark.json index 88cf0a66..8b9885e8 100644 --- a/project/whale_tales/workflows/mark.json +++ b/project/whale_tales/workflows/mark.json @@ -10,7 +10,7 @@ "date_present": { "tool": "pickOne", - "instruction": "Are there any *unmarked* date entries present?", + "instruction": "Are there any *unmarked* __*date*__ entries present?", "help": { "title": "Dates", "body": "Typically each log entry begins with a date. The year may only appear at the top of the page. Select 'yes' if you see any date mentioned anywhere on the page." @@ -27,7 +27,7 @@ "date": { "generates_subjects": true, "tool":"pickOneMarkOne", - "instruction":"Draw a rectangle around each *unmarked* date.", + "instruction":"Draw a rectangle around each *unmarked* __*date*__.", "help": { "title": "Dates", "body": "Typically each log entry begins with a date. The year may only appear at the top of the page. Select 'yes' if you see any date mentioned anywhere on the page." @@ -42,7 +42,7 @@ "location_present": { "tool": "pickOne", - "instruction": "Is there location or position information present that *has not been marked*?", + "instruction": "Is there __*location*__ or __*position*__ information present that *has not been marked*?", "help": { "title": "Whaling ground, position, port-of-call", "body": "Select the type of location, then draw a rectangle around each location of that type. Mark both the ocean region or whaling ground (typically at the top of the page) and any specific positions or geographic references that you see further down on the page." @@ -59,7 +59,7 @@ "location": { "generates_subjects": true, "tool":"pickOneMarkOne", - "instruction":"Pick a position or location option. Draw a rectangle around each corresponding text region that *has not been marked*.", + "instruction":"Pick a __*location*__ or __*position*__ option. Draw a rectangle around each corresponding text region that *has not been marked*.", "help": { "title": "Ship Location and Position", "body": "This can be any geographic reference, from the name of a port or landmark seen, to latitude/longitude coordinates. Often the whaling ground or ocean that the ship was in can be found written at the top of the page." @@ -78,7 +78,7 @@ "sea_ice_present": { "tool": "pickOne", - "instruction": "Are there any *unmarked* mentions of sea ice?", + "instruction": "Are there any *unmarked* mentions of __*sea ice*__?", "help": { "title": "Ice ahead!", "body": "Knowing where sea ice is present is important for climate studies. Even knowing that sea ice was mentioned is useful. Often, descriptions of the sailing conditions allow us to make inferences about nearby sea ice. Scan the document and select 'yes' if there are any mentions of sea ice. (You will then be prompted to continue on to tag specific technical descriptions.)" @@ -101,7 +101,7 @@ "sailing_condition_present": { "tool": "pickOne", - "instruction": "Are there any *unmarked* descriptions of the sailing conditions with respect to sea ice?", + "instruction": "Are there any *unmarked* descriptions of the __*sailing conditions*__ with respect to sea ice?", "help": { "title": "Sailing Description and Sea Ice", "body": "Look for any reference to how the ship is sailing through ice (including if the ship is sailing in leads, beset, nipped/damaged, or even wrecked). How the ship is being sailed tells us a lot about the sea ice around it, even if there isn’t any specific description of the ice noted in the log. If you don’t see any reference to sailing near or through ice, select 'no.'" @@ -150,7 +150,7 @@ "sea_ice": { "tool": "pickOne", - "instruction": "Is there a specific description of sea ice that *has not* been marked?", + "instruction": "Is there a specific description of __*sea ice*__ that *has not* been marked?", "next_task": "weather_present", "help": { "title": "What is the sea ice like?", @@ -231,7 +231,7 @@ "weather_present": { "tool": "pickOne", - "instruction": "Are there any *unmarked* descriptions of the weather?", + "instruction": "Are there any *unmarked* descriptions of the __*weather*__?", "next_task": "optional_entries", "help": { "title": "Weather", @@ -248,7 +248,7 @@ "weather": { "generates_subjects": true, "tool":"pickOneMarkOne", - "instruction":"Pick a weather description. Draw a rectangle around each corresponding text region that *has not been marked*.", + "instruction":"Pick a __*weather description*__. Draw a rectangle around each corresponding text region that *has not been marked*.", "help": { "title": "A record of wind and wave", "file": "weather" @@ -294,7 +294,7 @@ "events": { "generates_subjects": true, "tool":"pickOneMarkOne", - "instruction":"Pick the type of event that best matches the corresponding text. Draw a rectangle around each *unmarked* instance.", + "instruction":"Pick the type of __*event*__ that best matches the corresponding text. Draw a rectangle around each *unmarked* instance.", "help": { "title": "Ship’s logs tell all kinds of stories", "body": "Select the description of the type of event, then draw a rectangle around each event of that type. All sorts of notable events are recorded in the ship’s logbook. If you see anything from the list, please mark it. You can also mark any other kind of happening that is interesting to you. And if there is a special story told in the log you can discuss it with the community on Talk." @@ -314,7 +314,7 @@ "art": { "generates_subjects": true, "tool":"pickOneMarkOne", - "instruction":"Pick the type of art that best matches the corresponding text. Draw a rectangle around each *unmarked* instance.", + "instruction":"Pick the type of __*art*__ that best matches the corresponding text. Draw a rectangle around each *unmarked* instance.", "help": { "title": "Arts and crafts", "body": "Select the description of the type of art, then draw a rectangle around each artwork (or mention of art) of that type. Please mark arts and crafts from the list, or any other artwork you find in the logbook. Some artwork, scrimshaw for example, might also be reported as an item of informal trade in the logbook. Please mark these mentions as well." diff --git a/project/whale_tales/workflows/transcribe.json b/project/whale_tales/workflows/transcribe.json index bff6b134..09b4a1b4 100644 --- a/project/whale_tales/workflows/transcribe.json +++ b/project/whale_tales/workflows/transcribe.json @@ -302,13 +302,6 @@ "next_task": null }, - "sea_ice_other_description": { - "tool": "textAreaTool", - "tool_config": {}, - "instruction": "Include any additional comments regarding the sea ice.", - "next_task": null - }, - "weather_wind": { "tool": "compositeTool", @@ -395,6 +388,13 @@ "next_task": null }, + "event_social": { + "tool": "textTool", + "tool_config": {}, + "instruction": "Briefly describe the social event.", + "next_task": null + }, + "event_other": { "tool": "textTool", "tool_config": {}, @@ -438,13 +438,6 @@ }, - "sea_ice_other_description": { - "tool": "textTool", - "tool_config": {}, - "instruction": "Enter the sea ice description.", - "next_task": null - }, -