osm 0.1.17 → 0.2.0

data/lib/osm/grouping.rb

@@ -30,11 +30,12 @@ module Osm
 
     # Get the groupings that a section has
     # @param [Osm::Api] api The api to use to make the request
-    # @param [Fixnum] section the section (or its ID) of the section to get groupings for
+    # @param [Fixnum] section The section (or its ID) of the section to get groupings for
     # @!macro options_get
     # @return [Array<Osm::Grouping>, nil] An array of groupings or nil if the user can not access that section
     def self.get_for_section(api, section, options={})
       section_id = section.to_i
+      require_ability_to(api, :read, :member, section_id)
       cache_key = ['groupings', section_id]
 
       if !options[:no_cache] && cache_exist?(api, cache_key)
@@ -63,7 +64,45 @@ module Osm
 
     # @!method initialize
     #   Initialize a new Term
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+    #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+
+
+    # Update the grouping in OSM
+    # @param [Osm::Api] api The api to use to make the request
+    # @return [Boolan] whether the member was successfully updated or not
+    # @raise [Osm::ObjectIsInvalid] If the Grouping is invalid
+    def update(api)
+      raise Osm::ObjectIsInvalid, 'grouping is invalid' unless valid?
+      require_ability_to(api, :read, :member, section_id)
+
+      to_update = changed_attributes
+      result = true
+
+      if to_update.include?('name') || to_update.include?('active')
+        data = api.perform_query("users.php?action=editPatrol&sectionid=#{section_id}", {
+          'patrolid' => self.id,
+          'name' => name,
+          'active' => active,
+        })
+        result &= data.nil?
+      end
+
+      if to_update.include?('points')
+        data = api.perform_query("users.php?action=updatePatrolPoints&sectionid=#{section_id}", {
+          'patrolid' => self.id,
+          'points' => points,
+        })
+        result &= (data == {})
+      end
+
+      if result
+        reset_changed_attributes
+        # The cached groupings for the section will be out of date - remove them
+        Osm::Model.cache_delete(api, ['groupings', section_id])
+      end
+
+      return result
+    end
 
 
   end # Class Grouping

data/lib/osm/{evening.rb → meeting.rb}

@@ -1,30 +1,28 @@
-# TODO with next version bump - rename to Meeting, also rename meeting_date to date
-
 module Osm
 
-  class Evening < Osm::Model
+  class Meeting < Osm::Model
     class Activity; end # Ensure the constant exists for the validators
 
     # @!attribute [rw] id
-    #   @return [Fixnum] the id of the evening
+    #   @return [Fixnum] the id of the meeting
     # @!attribute [rw] section_id
-    #   @return [Fixnum] the section the evening belongs to
+    #   @return [Fixnum] the section the meeting belongs to
     # @!attribute [rw] title
-    #   @return [String] the title of the evening
+    #   @return [String] the title of the meeting
     # @!attribute [rw] notes_for_parents
     #   @return [String] notes to be shared with parents
     # @!attribute [rw] games
-    #   @return [String] games to be played during the evening
+    #   @return [String] games to be played during the meeting
     # @!attribute [rw] pre_notes
-    #   @return [String] notes for the start of the evening
+    #   @return [String] notes for the start of the meeting
     # @!attribute [rw] post_notes
-    #   @return [String] notes for the end of the evening
+    #   @return [String] notes for the end of the meeting
     # @!attribute [rw] leaders
-    #   @return [String] the leaders present at the evening
-    # @!attribute [rw] meeting_date
-    #   @return [Date] the date of the evening
+    #   @return [String] the leaders present at the meeting
+    # @!attribute [rw] date
+    #   @return [Date] the date of the meeting
     # @!attribute [rw] activities
-    #   @return [Array<Activity>] list of activities being done during the evening
+    #   @return [Array<Activity>] list of activities being done during the meeting
     # @!attribute [rw] start_time
     #   @return [String] the start time (hh:mm)
     # @!attribute [rw] finish_time
@@ -38,40 +36,40 @@ module Osm
     attribute :pre_notes, :type => String, :default => ''
     attribute :post_notes, :type => String, :default => ''
     attribute :leaders, :type => String, :default => ''
-    attribute :meeting_date, :type => Date
+    attribute :date, :type => Date
     attribute :start_time, :type => String
     attribute :finish_time, :type => String
     attribute :activities, :default => []
 
-    attr_accessible :id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :meeting_date, :activities, :start_time, :finish_time
+    attr_accessible :id, :section_id, :title, :notes_for_parents, :games, :pre_notes, :post_notes, :leaders, :date, :activities, :start_time, :finish_time
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
     validates_presence_of :title
-    validates_presence_of :meeting_date
+    validates_presence_of :date
     validates_format_of :start_time, :with => Osm::OSM_TIME_REGEX, :message => 'is not in the correct format (HH:MM)', :allow_blank => true
     validates_format_of :finish_time, :with => Osm::OSM_TIME_REGEX, :message => 'is not in the correct format (HH:MM)', :allow_blank => true
 
-    validates :activities, :array_of => {:item_type => Osm::Evening::Activity, :item_valid => true}
+    validates :activities, :array_of => {:item_type => Osm::Meeting::Activity, :item_valid => true}
 
     # @!method initialize
-    #   Initialize a new Evening
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+    #   Initialize a new Meeting
+    #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 
     # Get the programme for a given term
     # @param [Osm::Api] api The api to use to make the request
-    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the programme for
-    # @param [Osm::term, Fixnum, nil] term the term (or its ID) to get the programme for, passing nil causes the current term to be used
+    # @param [Osm::Section, Fixnum, #to_i] section The section (or its ID) to get the programme for
+    # @param [Osm::term, Fixnum, nil] term The term (or its ID) to get the programme for, passing nil causes the current term to be used
     # @!macro options_get
-    # @return [Array<Osm::Evening>]
-    # TODO Change to get_all in next version bump
-    def self.get_programme(api, section, term=nil, options={})
+    # @return [Array<Osm::Meeting>]
+    def self.get_for_section(api, section, term=nil, options={})
+      require_ability_to(api, :read, :programme, section, options)
       section_id = section.to_i
       term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, section).id : term.to_i
       cache_key = ['programme', section_id, term_id]
 
-      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section_id, :programme).include?(:read)
+      if !options[:no_cache] && cache_exist?(api, cache_key)
         return cache_read(api, cache_key)
       end
 
@@ -94,13 +92,13 @@ module Osm
         attributes[:leaders] = item['leaders'] || ''
         attributes[:start_time] = item['starttime'].nil? ? nil : item['starttime'][0..4]
         attributes[:finish_time] = item['endtime'].nil? ? nil : item['endtime'][0..4]
-        attributes[:meeting_date] = Osm::parse_date(item['meetingdate'])
+        attributes[:date] = Osm::parse_date(item['meetingdate'])
   
         our_activities = activities[item['eveningid']]
         attributes[:activities] = Array.new
         unless our_activities.nil?
           our_activities.each do |activity_data|
-            attributes[:activities].push Osm::Evening::Activity.new(
+            attributes[:activities].push Osm::Meeting::Activity.new(
               :activity_id => Osm::to_i_or_nil(activity_data['activityid']),
               :title => activity_data['title'],
               :notes => activity_data['notes'],
@@ -116,36 +114,39 @@ module Osm
     end
 
 
-    # Create an evening in OSM
+    # Create a meeting in OSM
     # @param [Osm::Api] api The api to use to make the request
-    # @return [Osm::Evening, nil] the created evening, nil if failed
+    # @return [Osm::Meeting, nil] the created meeting, nil if failed
     def self.create(api, parameters)
-      evening = new(parameters)
+      require_ability_to(api, :write, :programme, parameters[:section_id])
+      meeting = new(parameters)
 
       data = api.perform_query("programme.php?action=addActivityToProgramme", {
-        'meetingdate' => evening.meeting_date.strftime(Osm::OSM_DATE_FORMAT),
-        'sectionid' => evening.section_id,
+        'meetingdate' => meeting.date.strftime(Osm::OSM_DATE_FORMAT),
+        'sectionid' => meeting.section_id,
         'activityid' => -1,
-        'start' => evening.meeting_date.strftime(Osm::OSM_DATE_FORMAT),
-        'starttime' => evening.start_time,
-        'endtime' => evening.finish_time,
-        'title' => evening.title,
+        'start' => meeting.date.strftime(Osm::OSM_DATE_FORMAT),
+        'starttime' => meeting.start_time,
+        'endtime' => meeting.finish_time,
+        'title' => meeting.title,
       })
 
       # The cached programmes for the section will be out of date - remove them
-      Osm::Term.get_for_section(api, evening.section_id).each do |term|
-        cache_delete(api, ['programme', evening.section_id, term.id])
+      Osm::Term.get_for_section(api, meeting.section_id).each do |term|
+        cache_delete(api, ['programme', meeting.section_id, term.id])
       end
 
-      return data.is_a?(Hash) ? evening : nil
+      return data.is_a?(Hash) ? meeting : nil
     end
 
 
-    # Update an evening in OSM
+    # Update an meeting in OSM
     # @param [Osm::Api] api The api to use to make the request
     # @return [Boolean] if the operation suceeded or not
+    # @raise [Osm::ObjectIsInvalid] If the Meeting is invalid
     def update(api)
-      raise ObjectIsInvalid, 'evening is invalid' unless valid?
+      raise Osm::ObjectIsInvalid, 'meeting is invalid' unless valid?
+      require_ability_to(api, :write, :programme, section_id)
 
       activities_data = Array.new
       activities.each do |activity|
@@ -160,7 +161,7 @@ module Osm
       api_data = {
         'eveningid' => id,
         'sectionid' => section_id,
-        'meetingdate' => meeting_date.strftime(Osm::OSM_DATE_FORMAT),
+        'meetingdate' => date.strftime(Osm::OSM_DATE_FORMAT),
         'starttime' => start_time,
         'endtime' => finish_time,
         'title' => title,
@@ -173,26 +174,30 @@ module Osm
       }
       response = api.perform_query("programme.php?action=editEvening", api_data)
 
-      # The cached programmes for the section will be out of date - remove them
-      Osm::Term.get_for_section(api, section_id).each do |term|
-        cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(meeting_date)
+      if response.is_a?(Hash) && (response['result'] == 0)
+        reset_changed_attributes
+        # The cached programmes for the section will be out of date - remove them
+        Osm::Term.get_for_section(api, section_id).each do |term|
+          cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(date)
+        end
+        return true
+      else
+        return false
       end
-
-      return response.is_a?(Hash) && (response['result'] == 0)
     end
 
-    # Add an activity to this evening in OSM
+    # Add an activity to this meeting in OSM
     # @param [Osm::Api] api The api to use to make the request
-    # @param [Osm::Activity] activity The Activity to add to the Evening
-    # @param [String] notes The notes which should appear for this Activity on this Evening
+    # @param [Osm::Activity] activity The Activity to add to the Meeting
+    # @param [String] notes The notes which should appear for this Activity on this Meeting
     # @return [Boolean] Whether the activity ws successfully added
     def add_activity(api, activity, notes='')
-      if activity.add_to_programme(api, section_id, meeting_date, notes)
-        activities.push Osm::Evening::Activity.new(:activity_id => activity.id, :notes => notes, :title => activity.title)
+      if activity.add_to_programme(api, section_id, date, notes)
+        activities.push Osm::Meeting::Activity.new(:activity_id => activity.id, :notes => notes, :title => activity.title)
 
         # The cached programmes for the section will be out of date - remove them
         Osm::Term.get_for_section(api, section_id).each do |term|
-          cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(meeting_date)
+          cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(date)
         end
 
         return true
@@ -201,34 +206,36 @@ module Osm
       return false
     end
 
-    # Delete evening from OSM
+    # Delete meeting from OSM
     # @param [Osm::Api] api The api to use to make the request
     # @return [Boolean] true
     def delete(api)
+      require_ability_to(api, :write, :programme, section_id)
       data = api.perform_query("programme.php?action=deleteEvening&eveningid=#{id}&sectionid=#{section_id}")
 
       # The cached programmes for the section will be out of date - remove them
       Osm::Term.get_for_section(api, section_id).each do |term|
-        cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(meeting_date)
+        cache_delete(api, ['programme', section_id, term.id]) if term.contains_date?(date)
       end
 
       return true
     end
 
 
-    # Get the badge requirements met on a specific evening
+    # Get the badge requirements met on a specific meeting
     # @param [Osm::Api] api The api to use to make the request
     # @!macro options_get
     # @return [Array<Hash>] hashes ready to pass into the update_register method
     def get_badge_requirements(api, options={})
+      require_ability_to(api, :read, :programme, section_id, options)
       section = Osm::Section.get(api, section_id)
       cache_key = ['badge_requirements', section.id, id]
 
-      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section_id, :programme).include?(:read)
+      if !options[:no_cache] && cache_exist?(api, cache_key)
         return cache_read(api, cache_key)
       end
 
-      data = api.perform_query("users.php?action=getActivityRequirements&date=#{meeting_date.strftime(Osm::OSM_DATE_FORMAT)}&sectionid=#{section.id}&section=#{section.type}")
+      data = api.perform_query("users.php?action=getActivityRequirements&date=#{date.strftime(Osm::OSM_DATE_FORMAT)}&sectionid=#{section.id}&section=#{section.type}")
 
       cache_write(api, cache_key, data)
       return data
@@ -240,7 +247,7 @@ module Osm
         compare = self.section_id <=> another.section_id
         return compare unless compare == 0
   
-        compare = self.meeting_date <=> another.meeting_date
+        compare = self.date <=> another.date
         return compare unless compare == 0
 
         my_start_time = self.start_time.split(':').map{ |i| i.to_i }
@@ -267,7 +274,7 @@ module Osm
       # @!attribute [rw] title
       #   @return [String] the activity's title
       # @!attribute [rw] notes
-      #   @return [String] notes relevant to doing this activity on this evening
+      #   @return [String] notes relevant to doing this activity on this meeting
 
       attribute :activity_id, :type => Integer
       attribute :title, :type => String
@@ -279,11 +286,11 @@ module Osm
       validates_presence_of :title
 
       # @!method initialize
-      #   Initialize a new Evening::Activity
-      #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+      #   Initialize a new Meeting::Activity
+      #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
-    end # Class Evening::Activity
+    end # Class Meeting::Activity
 
-  end # Class Evening
+  end # Class Meeting
 
 end # Module

data/lib/osm/member.rb

@@ -74,8 +74,6 @@ module Osm
     #   @return [Fixnum] the grouping within the section that the member belongs to
     # @!attribute [rw] grouping_leader
     #   @return [Fixnum] whether the member is the grouping leader (0=no, 1=seconder/APL, 2=sixer/PL)
-    # @!attribute [rw] grouping_label
-    #   @return [Fixnum] the grouping within the section that the member belongs to (as displayed in OSM, if member was retrieved from OSM)
     # @!attribute [rw] joined
     #   @return [Date] when the member joined the section
     # @!attribute [rw] age
@@ -118,7 +116,6 @@ module Osm
     attribute :custom8, :type => String, :default => ''
     attribute :custom9, :type => String, :default => ''
     attribute :grouping_id, :type => Integer
-    attribute :grouping_label, :type => String, :default => ''
     attribute :grouping_leader, :type => Integer
     attribute :joined, :type => Date
     attribute :age, :type => String
@@ -128,7 +125,7 @@ module Osm
                     :phone1, :phone2, :phone3, :phone4, :address, :address2, :date_of_birth, :started,
                     :joining_in_years, :parents, :notes, :medical, :religion, :school, :ethnicity, :subs,
                     :custom1, :custom2, :custom3, :custom4, :custom5, :custom6, :custom7, :custom8, :custom9,
-                    :grouping_id, :grouping_label, :grouping_leader, :joined, :age, :joined_years
+                    :grouping_id, :grouping_leader, :joined, :age, :joined_years
 
     validates_numericality_of :id, :only_integer=>true, :greater_than=>0, :unless => Proc.new { |r| r.id.nil? }
     validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
@@ -146,17 +143,18 @@ module Osm
 
     # Get members for a section
     # @param [Osm::Api] api The api to use to make the request
-    # @param [Osm::Section, Fixnum] section the section (or its ID) to get the members for
-    # @param [Osm::Term, Fixnum, nil] term the term (or its ID) to get the members for, passing nil causes the current term to be used
+    # @param [Osm::Section, Fixnum, #to_i] section The section (or its ID) to get the members for
+    # @param [Osm::Term, Fixnum, #to_i, nil] term The term (or its ID) to get the members for, passing nil causes the current term to be used
     # @!macro options_get
     # @return [Array<Osm::Member>]
     def self.get_for_section(api, section, term=nil, options={})
+      require_ability_to(api, :read, :member, section, options)
       section = Osm::Section.get(api, section) if section.is_a?(Fixnum)
       term = -1 if section.waiting?
       term_id = term.nil? ? Osm::Term.get_current_term_for_section(api, section).id : term.to_i
       cache_key = ['members', section.id, term_id]
 
-      if !options[:no_cache] && cache_exist?(api, cache_key) && get_user_permission(api, section.id, :member).include?(:read)
+      if !options[:no_cache] && cache_exist?(api, cache_key)
         return cache_read(api, cache_key)
       end
 
@@ -200,7 +198,6 @@ module Osm
           :custom8 => item['custom8'],
           :custom9 => item['custom9'],
           :grouping_id => Osm::to_i_or_nil(item['patrolid']),
-          :grouping_label => item['patrol'],
           :grouping_leader => Osm::to_i_or_nil(item['patrolleader']),
           :joined => Osm::parse_date(item['joined']),
           :age => item['age'].gsub(' ', ''),
@@ -213,31 +210,20 @@ module Osm
     end
 
 
-    # @deprecated use grouping_label instead
-    # @return [String] the grouping as displayed in OSM
-    # TODO - Use a Grouping object not String when upping the version
-    def grouping
-      return self.grouping_label
-    end
-    # @deprecated use grouping_label instead
-    # TODO - Use a Grouping object not String when upping the version
-    def grouping=(new_grouping)
-      return self.grouping_label = new_grouping
-    end
-
-
-
     # @!method initialize
     #   Initialize a new Member
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+    #   @param [Hash] attributes The hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
 
 
     # Create the user in OSM
     # @param [Osm::Api] api The api to use to make the request
     # @return [Boolan] whether the member was successfully added or not
+    # @raise [Osm::ObjectIsInvalid] If the Member is invalid
+    # @raise [Osm::Error] If the member already exists in OSM
     def create(api)
-      raise ObjectIsInvalid, 'member is invalid' unless valid?
-      raise Error, 'the member already exists in OSM' unless id.nil?
+      raise Osm::ObjectIsInvalid, 'member is invalid' unless valid?
+      require_ability_to(api, :write, :member, section_id)
+      raise Osm::Error, 'the member already exists in OSM' unless id.nil?
 
       data = api.perform_query("users.php?action=newMember", {
         'firstname' => first_name,
@@ -288,45 +274,47 @@ module Osm
       end
     end
 
-    # Update the user in OSM
+    # Update the member in OSM
     # @param [Osm::Api] api The api to use to make the request
     # @return [Boolan] whether the member was successfully updated or not
+    # @raise [Osm::ObjectIsInvalid] If the Member is invalid
     def update(api)
-      raise ObjectIsInvalid, 'member is invalid' unless valid?
+      raise Osm::ObjectIsInvalid, 'member is invalid' unless valid?
+      require_ability_to(api, :write, :member, section_id)
 
-      values = {
-        'firstname' => first_name,
-        'lastname' => last_name,
-        'dob' => date_of_birth.strftime(Osm::OSM_DATE_FORMAT),
-        'started' => started.strftime(Osm::OSM_DATE_FORMAT),
-        'startedsection' => joined.strftime(Osm::OSM_DATE_FORMAT),
-        'email1' => email1,
-        'email2' => email2,
-        'email3' => email3,
-        'email4' => email4,
-        'phone1' => phone1,
-        'phone2' => phone2,
-        'phone3' => phone3,
-        'phone4' => phone4,
-        'address' => address,
-        'address2' => address2,
-        'parents' => parents,
-        'notes' => notes,
-        'medical' => medical,
-        'religion' => religion,
-        'school' => school,
-        'ethnicity' => ethnicity,
-        'subs' => subs,
-        'custom1' => custom1,
-        'custom2' => custom2,
-        'custom3' => custom3,
-        'custom4' => custom4,
-        'custom5' => custom5,
-        'custom6' => custom6,
-        'custom7' => custom7,
-        'custom8' => custom8,
-        'custom9' => custom9,
-      }
+      to_update = changed_attributes
+      values = {}
+      values['firstname']      = first_name if to_update.include?('first_name')
+      values['lastname']       = last_name  if to_update.include?('last_name')
+      values['dob']            = date_of_birth.strftime(Osm::OSM_DATE_FORMAT) if to_update.include?('date_of_birth')
+      values['started']        = started.strftime(Osm::OSM_DATE_FORMAT) if to_update.include?('started')
+      values['startedsection'] = joined.strftime(Osm::OSM_DATE_FORMAT) if to_update.include?('joined')
+      values['email1']         = email1     if to_update.include?('email1')
+      values['email2']         = email2     if to_update.include?('email2')
+      values['email3']         = email3     if to_update.include?('email3')
+      values['email4']         = email4     if to_update.include?('email4')
+      values['phone1']         = phone1     if to_update.include?('phone1')
+      values['phone2']         = phone2     if to_update.include?('phone2')
+      values['phone3']         = phone3     if to_update.include?('phone3')
+      values['phone4']         = phone4     if to_update.include?('phone3')
+      values['address']        = address    if to_update.include?('address')
+      values['address2']       = address2   if to_update.include?('address2')
+      values['parents']        = parents    if to_update.include?('parents')
+      values['notes']          = notes      if to_update.include?('notes')
+      values['medical']        = medical    if to_update.include?('medical')
+      values['religion']       = religion   if to_update.include?('religion')
+      values['school']         = school     if to_update.include?('school')
+      values['ethnicity']      = ethnicity  if to_update.include?('ethnicity')
+      values['subs']           = subs       if to_update.include?('subs')
+      values['custom1']        = custom1    if to_update.include?('custom1')
+      values['custom2']        = custom2    if to_update.include?('custom2')
+      values['custom3']        = custom3    if to_update.include?('custom3')
+      values['custom4']        = custom4    if to_update.include?('custom4')
+      values['custom5']        = custom5    if to_update.include?('custom5')
+      values['custom6']        = custom6    if to_update.include?('custom6')
+      values['custom7']        = custom7    if to_update.include?('custom7')
+      values['custom8']        = custom8    if to_update.include?('custom8')
+      values['custom9']        = custom9    if to_update.include?('custom9')
 
       result = true
       values.each do |column, value|
@@ -339,13 +327,23 @@ module Osm
         result &= (data[column] == value.to_s)
       end
 
-      data = api.perform_query("users.php?action=updateMemberPatrol", {
-        'scoutid' => self.id,
-        'patrolid' => grouping_id,
-        'pl' => grouping_leader,
-        'sectionid' => section_id,
-      })
-      result &= ((data['patrolid'].to_i == grouping_id) && (data['patrolleader'].to_i == grouping_leader))
+      if to_update.include?('grouping_id') || to_update.include?('grouping_leader')
+        data = api.perform_query("users.php?action=updateMemberPatrol", {
+          'scoutid' => self.id,
+          'patrolid' => grouping_id,
+          'pl' => grouping_leader,
+          'sectionid' => section_id,
+        })
+        result &= ((data['patrolid'].to_i == grouping_id) && (data['patrolleader'].to_i == grouping_leader))
+      end
+
+      if result
+        reset_changed_attributes
+        # The cached columns for the flexi record will be out of date - remove them
+        Osm::Term.get_for_section(api, section_id).each do |term|
+          Osm::Model.cache_delete(api, ['members', section_id, term.id])
+        end
+      end
 
       return result
     end
@@ -363,12 +361,34 @@ module Osm
     end
 
     # Get the full name
-    # @param [String] seperator what to split the scout's first name and last name with
+    # @param [String] seperator What to split the scout's first name and last name with
     # @return [String] this scout's full name seperated by the optional seperator
     def name(seperator=' ')
       return "#{first_name}#{seperator.to_s}#{last_name}"
     end
 
+    # Get the My.SCOUT link for this member
+    # @param [Osm::Api] api The api to use to make the request
+    # @param [Symbol] link_to The page in My.SCOUT to link to (:payments, :events, :programme or :badges)
+    # @return [String] the link for this member's My.SCOUT
+    # @raise [Osm::ObjectIsInvalid] If the Member is invalid
+    # @raise [Osm::ArgumentIsInvalid] If link_to is not an allowed Symbol
+    # @raise [Osm::Error] if the member does not already exist in OSM or the member's My.SCOUT key could not be retrieved from OSM
+    def myscout_link(api, link_to=:badges)
+      raise Osm::ObjectIsInvalid, 'member is invalid' unless valid?
+      require_ability_to(api, :read, :member, section_id)
+      raise Osm::Error, 'the member does not already exist in OSM' if id.nil?
+      raise Osm::ArgumentIsInvalid, 'link_to is invalid' unless [:payments, :events, :programme, :badges].include?(link_to)
+
+      if @myscout_link_key.nil?
+        data = api.perform_query("api.php?action=getMyScoutKey&sectionid=#{section_id}&scoutid=#{self.id}")
+        raise Osm::Error, 'Could not retrieve the key for the link from OSM' unless data['ok']
+        @myscout_link_key = data['key']
+      end
+
+      return "https://www.onlinescoutmanager.co.uk/parents/#{link_to}.php?sc=#{self.id}&se=#{section_id}&c=#{@myscout_link_key}"
+    end
+
   end # Class Member
 
 end # Module