osm 0.0.26 → 0.1.0

data/lib/osm/flexi_record_data.rb

@@ -1,51 +0,0 @@
-module Osm
-
-  class FlexiRecordData
-    include ::ActiveAttr::MassAssignmentSecurity
-    include ::ActiveAttr::Model
-
-    # @!attribute [rw] member_id
-    #   @return [Fixnum] OSM id for the member
-    # @!attribute [rw] grouping__id
-    #   @return [Fixnum] OSM id for the grouping the member is in
-    # @!attribute [rw] fields
-    #   @return [Hash] Keys are the field's id, values are the field values
-
-    attribute :member_id, :type => Integer
-    attribute :grouping_id, :type => Integer
-    attribute :fields, :default => {}
-
-    attr_accessible :member_id, :grouping_id, :fields
-
-    validates_numericality_of :member_id, :only_integer=>true, :greater_than=>0
-    validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2
-    validates :fields, :hash => {:key_type => String}
-
-
-    # @!method initialize
-    #   Initialize a new FlexiRecordData
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
-
-
-    # Initialize a new FlexiRecordData from api data
-    # @param [Hash] data the hash of data provided by the API
-    def self.from_api(data)
-      data.merge!({
-        'dob' => data['dob'].nil? ? nil : Osm::parse_date(data['dob'], :ignore_epoch => true),
-        'total' => Osm::to_i_or_nil(data['total'].eql?('') ? nil : data['total']),
-        'completed' => Osm::to_i_or_nil(data['completed'].eql?('') ? nil : data['completed']),
-        'age' => data['age'].eql?('') ? nil : data['age'],
-      })
-
-      new({
-        :member_id => Osm::to_i_or_nil(data['scoutid']),
-        :grouping_id => Osm::to_i_or_nil(data['patrolid'].eql?('') ? nil : data['patrolid']),
-        :fields => data.select { |key, value|
-          ['firstname', 'lastname', 'dob', 'total', 'completed', 'age'].include?(key) || key.to_s.match(/\Af_\d+\Z/)
-        }
-      })
-    end
-
-  end # Class FlexiRecordData
-
-end # Module

data/lib/osm/flexi_record_field.rb

@@ -1,42 +0,0 @@
-module Osm
-
-  class FlexiRecordField
-    include ::ActiveAttr::MassAssignmentSecurity
-    include ::ActiveAttr::Model
-
-    # @!attribute [rw] id
-    #   @return [String] OSM identifier for the field. Special ones are 'dob', 'total', 'completed', 'age', 'firstname' and 'lastname', user ones are of the format 'f\_NUMBER'
-    # @!attribute [rw] name
-    #   @return [String] Human readable name for the field
-    # @!attribute [rw] editable
-    #   @return [Boolean] Wether the field can be edited
-
-    attribute :id, :type => String
-    attribute :name, :type => String
-    attribute :editable, :type => Boolean, :default => false
-
-    attr_accessible :id, :name, :editable
-
-    validates_presence_of :id
-    validates_presence_of :name
-    validates_inclusion_of :editable, :in => [true, false]
-
-
-    # @!method initialize
-    #   Initialize a new FlexiRecordField
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
-
-
-    # Initialize a new FlexiRecordField from api data
-    # @param [Hash] data the hash of data provided by the API
-    def self.from_api(data)
-      new({
-        :id => data['field'],
-        :name => data['name'],
-        :editable => data['editable'],
-      })
-    end
-
-  end # Class FlexiRecordField
-
-end # Module

data/lib/osm/register_data.rb

@@ -1,64 +0,0 @@
-module Osm
-
-  class RegisterData
-    include ::ActiveAttr::MassAssignmentSecurity
-    include ::ActiveAttr::Model
-
-    # @!attribute [rw] member_id
-    #   @return [Fixnum] The OSM ID for the member
-    # @!attribute [rw] grouping_id
-    #   @return [Fixnum] The OSM ID for the member's grouping
-    # @!attribute [rw] section_id
-    #   @return [Fixnum] The OSM ID for the member's section
-    # @!attribute [rw] first_name
-    #   @return [String] The member's first name
-    # @!attribute [rw] last_name
-    #   @return [String] The member's last name
-    # @!attribute [rw] total
-    #   @return [FixNum] Total
-    # @!attribute [rw] attendance
-    #   @return [Hash] The data for each field - keys are the date, values one of 'Yes' (present), 'No' (known absence) or nil (absent)
-
-    attribute :member_id, :type => Integer
-    attribute :grouping_id, :type => Integer
-    attribute :section_id, :type => Integer
-    attribute :first_name, :type => String
-    attribute :last_name, :type => String
-    attribute :total, :type => Integer
-    attribute :attendance, :default => {}
-
-    attr_accessible :member_id, :first_name, :last_name, :section_id, :grouping_id, :total, :attendance
-
-    validates_numericality_of :member_id, :only_integer=>true, :greater_than=>0
-    validates_numericality_of :grouping_id, :only_integer=>true, :greater_than_or_equal_to=>-2
-    validates_numericality_of :section_id, :only_integer=>true, :greater_than=>0
-    validates_numericality_of :total, :only_integer=>true, :greater_than_or_equal_to=>0
-    validates_presence_of :first_name
-    validates_presence_of :last_name
-
-    validates :attendance, :hash => {:key_type => Date, :value_in => ['Yes', 'No', nil]}
-
-
-    # @!method initialize
-    #   Initialize a new registerData
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
-
-
-    # Initialize a new RegisterData from api data
-    # @param [Hash] data the hash of data provided by the API
-    def self.from_api(data)
-      new(
-        :member_id => Osm::to_i_or_nil(data['scoutid']),
-        :grouping_id => Osm::to_i_or_nil(data['patrolid']),
-        :section_id => Osm::to_i_or_nil(data['sectionid']),
-        :first_name => data['firstname'],
-        :last_name => data['lastname'],
-        :total => data['total'].to_i,
-        :attendance => data.select { |key, value| key.to_s.match(Osm::OSM_DATE_REGEX) }.
-                            inject({}){ |new_hash,(date, attendance)| new_hash[Date.strptime(date, Osm::OSM_DATE_FORMAT)] = attendance; new_hash },
-      )
-    end
-
-  end # Class RegisterData
-
-end # Module

data/lib/osm/register_field.rb

@@ -1,42 +0,0 @@
-module Osm
-
-  class RegisterField
-    include ::ActiveAttr::MassAssignmentSecurity
-    include ::ActiveAttr::Model
-
-    # @!attribute [rw] id
-    #   @return [String] OSM identifier for the field
-    # @!attribute [rw] name
-    #   @return [String] Human readable name for the field
-    # @!attribute [rw] tooltip
-    #   @return [String] Tooltip for the field
-
-    attribute :id, :type => String
-    attribute :name, :type => String
-    attribute :tooltip, :type => String, :default => ''
-
-    attr_accessible :id, :name, :tooltip
-
-    validates_presence_of :id
-    validates_presence_of :name
-    validates_presence_of :tooltip, :allow_blank => true
-
-
-    # @!method initialize
-    #   Initialize a new RegisterField
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
-
-
-    # Initialize a new RegisterField from api data
-    # @param [Hash] data the hash of data provided by the API
-    def self.from_api(data)
-      new({
-        :id => data['field'],
-        :name => data['name'],
-        :tooltip => data['tooltip'],
-      })
-    end
-
-  end # Class RegisterField
-
-end # Module

data/lib/osm/role.rb

@@ -1,133 +0,0 @@
-module Osm
-
-  class Role
-    include ::ActiveAttr::MassAssignmentSecurity
-    include ::ActiveAttr::Model
-
-
-    # @!attribute [rw] section
-    #   @param [Osm::Section] section the section this role is related to
-    #   @return [Osm::Section] the section this role related to
-    # @!attribute [rw] group_name
-    #   @return [String] the name of the group the section is in
-    # @!attribute [rw] group_id
-    #   @return [Fixnum] the group the section is in
-    # @!attribute [rw] permissions
-    #   @return [Hash] the permissions the user has in this role
-
-    attribute :section, :type => Object
-    attribute :group_name, :type => String
-    attribute :group_id, :type => Integer
-    attribute :permissions, :default => {}
-
-    attr_accessible :section, :group_name, :group_id, :permissions
-
-
-    validates_presence_of :section
-    validates_numericality_of :group_id, :only_integer=>true, :greater_than=>0
-    validates_presence_of :group_name
-    validates_presence_of :permissions, :unless => Proc.new { |a| a.permissions == {} }
-
-    validates :permissions, :hash => {:key_type => Symbol, :value_in => [10, 20, 100]}
-
-    validates_each :section do |record, attr, value|
-      unless value.nil?
-        record.errors.add(attr, 'must also be valid') unless value.valid?
-      end
-    end
-
-
-    # @!method initialize
-    #   Initialize a new Role
-    #   @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
-
-
-    # Initialize a new Role from api data
-    # @param [Hash] data the hash of data provided by the API
-    def self.from_api(data)
-      attributes = {}
-      attributes[:group_name] = data['groupname']
-      attributes[:group_id] = Osm::to_i_or_nil(data['groupid'])
-
-      # Convert permission values to a number
-      permissions = data['permissions'].is_a?(Hash) ? Osm::symbolize_hash(data['permissions']) : {}
-      permissions.each_key do |key|
-        permissions[key] = permissions[key].to_i
-      end
-
-      role = new(attributes.merge(:permissions => permissions))
-      role.section = Osm::Section.from_api(data['sectionid'], data['sectionname'], ActiveSupport::JSON.decode(data['sectionConfig']), role)
-
-      return role
-    end
-
-    # Determine if this role has read access for the provided permission
-    # @param [Symbol] key the permission being queried
-    # @return [Boolean] if this role can read the passed permission
-    def can_read?(key)
-      return [10, 20, 100].include?(permissions[key])
-    end
-
-    # Determine if this role has write access for the provided permission
-    # @param [Symbol] key the permission being queried
-    # @return [Boolean] if this role can write the passed permission
-    def can_write?(key)
-      return [20, 100].include?(permissions[key])
-    end
-
-    # Get section's long name in a consistent format
-    # @return [String] e.g. "Scouts (1st Somewhere)"
-    def long_name
-      group_name.blank? ? section.name : "#{section.name} (#{group_name})"
-    end
-
-    # Get section's full name in a consistent format
-    # @return [String] e.g. "1st Somewhere Beavers"
-    def full_name
-      group_name.blank? ? section.name : "#{group_name} #{section.name}"
-    end
-
-    def <=>(another_role)
-      begin
-        compare_group_name = group_name <=> another_role.group_name
-        return compare_group_name unless compare_group_name == 0
-  
-        return 0 if section.type == another_role.section.type
-        [:beavers, :cubs, :scouts, :explorers, :waiting, :adults].each do |type|
-          return -1 if section.type == type
-          return 1 if another_role.section.type == type
-        end
-      rescue NoMethodError
-        return false
-      end
-    end
-
-    def ==(another_role)
-      begin
-        return section == another_role.section
-      rescue NoMethodError
-        return false
-      end
-    end
-
-    def inspect
-      attribute_descriptions = attributes.merge('section' => (section.nil? ? nil : section.inspect_without_role(self)))
-      return_inspect(attribute_descriptions)
-    end
-
-    def inspect_without_section(exclude_section)
-      attribute_descriptions = (section == exclude_section) ? attributes.merge('section' => 'SET') : attributes
-      return_inspect(attribute_descriptions)
-    end
-
-
-    private
-    def return_inspect(attribute_descriptions)
-      attribute_descriptions.sort.map { |key, value| "#{key}: #{key.eql?('section') ? value : value.inspect}" }.join(", ")
-      separator = " " unless attribute_descriptions.empty?
-      "#<#{self.class.name}#{separator}#{attribute_descriptions}>"
-    end
-
-  end # Class Role
-
-end # Module

data/spec/osm/api_strangeness_spec.rb

@@ -1,83 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-
-describe "Online Scout Manager API Strangeness" do
-
-  before(:each) do
-    Osm::Api.configure({:api_id=>'1234', :api_token=>'12345678', :api_name=>'API', :api_site=>:scout})
-    @api = Osm::Api.new('2345', 'abcd')
-  end
-
-  it "handles a section with no type" do
-    body = '[{"sectionConfig":"{\"subscription_level\":3,\"subscription_expires\":\"2013-01-05\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member\'s Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member\'s Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Subs\",\"extraid\":\"529\"}],\"wizard\":\"false\",\"fields\":{\"email1\":true,\"email2\":true,\"email3\":true,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":true,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":true,\"saved\":true},\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}","groupname":"1st Somewhere","groupid":"1","groupNormalised":"1","sectionid":"1","sectionname":"Section 1","section":"cubs","isDefault":"1","permissions":{"badge":100,"member":100,"user":100,"register":100,"contact":100,"programme":100,"originator":1,"events":100,"finance":100,"flexi":100}}]'
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body)
-
-    @api.get_section(1).type.should == :unknown
-  end
-
-
-  it "handles strange extra records when getting roles" do
-    body = '[{"sectionConfig":"{\"subscription_level\":3,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"cubs\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member\'s Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member\'s Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[[\"1\",{\"name\":\"Subs\",\"extraid\":\"529\"}],[\"2\",{\"name\":\"Subs 2\",\"extraid\":\"530\"}]],\"wizard\":\"false\",\"fields\":{\"email1\":true,\"email2\":true,\"email3\":true,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":true,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":true,\"saved\":true},\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}","groupname":"1st Somewhere","groupid":"1","groupNormalised":"1","sectionid":"1","sectionname":"Section 1","section":"cubs","isDefault":"1","permissions":{"badge":100,"member":100,"user":100,"register":100,"contact":100,"programme":100,"originator":1,"events":100,"finance":100,"flexi":100}}]'
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body)
-
-    @api.get_roles()[0].should_not == nil
-  end
-
-
-  it "handles an empty array representing no due badges" do
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=outstandingBadges&section=cubs&sectionid=1&termid=1", :body => '[]')
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => '[{"sectionConfig":"{\"subscription_level\":\"3\",\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"cubs\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member\'s Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member\'s Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Subs\",\"extraid\":\"529\"}],\"wizard\":\"false\",\"fields\":{\"email1\":true,\"email2\":true,\"email3\":true,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":true,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":true,\"saved\":true},\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}","groupname":"1st Somewhere","groupid":"1","groupNormalised":"1","sectionid":"1","sectionname":"Section Name","section":"cubs","isDefault":"1","permissions":{"badge":100,"member":100,"user":100,"register":100,"contact":100,"programme":100,"originator":1,"events":100,"finance":100,"flexi":100}}]')
-    @api.get_due_badges(1, 1).should_not == nil
-  end
-
-
-  it "handles an empty array representing no notepads" do
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getNotepads", :body => '[]')
-    @api.get_notepad(1).should == nil
-  end
-
-
-  it "handles a non existant array when no events" do
-    data = '{"identifier":"eventid","label":"name"}'
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => data)
-
-    @api.get_events(1).should == []
-  end
-
-
-  it "handles a section config where fields is an empty array" do
-    body = '[{"sectionConfig":"{\"subscription_level\":3,\"subscription_expires\":\"2013-01-05\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member\'s Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member\'s Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Subs\",\"extraid\":\"529\"}],\"wizard\":\"false\",\"fields\":[],\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}","groupname":"1st Somewhere","groupid":"1","groupNormalised":"1","sectionid":"1","sectionname":"Section 1","section":"cubs","isDefault":"1","permissions":{"badge":100,"member":100,"user":100,"register":100,"contact":100,"programme":100,"originator":1,"events":100,"finance":100,"flexi":100}}]'
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body)
-
-    @api.get_section(1).fields.should == {}
-  end
-
-
-  it "handles a section's flexi records being a hash" do
-    data = {
-      'subscription_level' => '3',
-      'subscription_expires' => (Date.today + 60).strftime('%Y-%m-%d'),
-      'sectionType' => 'cubs',
-      'numscouts' => 10,
-      'columnNames' => {},
-      'fields' => {},
-      'intouch' => {},
-      'mobFields' => {},
-      'extraRecords' => {
-        '1' => {
-          'name' => 'Name 1',
-          'extraid' => 1
-        },
-        '2' => {
-          'name' => 'Name 2',
-          'extraid' => 2
-        }
-      }
-    }
-    section = Osm::Section.from_api(1, 'Name', data, nil)
-    section.flexi_records.size.should == 2
-
-  end
-
-end

data/spec/osm/event_attendance_spec.rb

@@ -1,34 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'date'
-
-
-describe "Event Attendance" do
-
-  it "Create from API data" do
-    data = {
-      "scoutid" => "1",
-      "firstname" => "First",
-      "lastname" => "Last",
-      "dob" => "1899-11-30",
-      "patrolid" => "2",
-      "f_1" => "a",
-      "attending" => "Yes",
-    }
-
-    ea = Osm::EventAttendance.from_api(data, 3)
-
-    ea.member_id.should == 1
-    ea.grouping_id.should == 2
-    ea.fields.should == {
-      'firstname' => 'First',
-      'lastname' => 'Last',
-      'dob' => Date.new(1899, 11, 30),
-      'attending' => true,
-      'f_1' => 'a',
-    }
-    ea.row.should == 3
-    ea.valid?.should be_true
-  end
-
-end