From 8d3247e084828a191552c9cd2a4222066168a058 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Wed, 20 May 2015 09:24:53 +0000 Subject: [PATCH] VRFS-3036 to hire builder --- ruby/lib/jam_ruby/models/band_search.rb | 6 ++-- .../member_search_filter.js.coffee | 6 ++++ .../clients/_band_search_filter.html.slim | 29 +++++++++++++++---- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/ruby/lib/jam_ruby/models/band_search.rb b/ruby/lib/jam_ruby/models/band_search.rb index 87c0a335a..bed8a2c26 100644 --- a/ruby/lib/jam_ruby/models/band_search.rb +++ b/ruby/lib/jam_ruby/models/band_search.rb @@ -94,10 +94,12 @@ module JamRuby KEY_PLAY_COMMIT => { keys: PLAY_COMMIT_VALS, map: PLAY_COMMITS }, KEY_TOUR_OPTION => { keys: TOUR_OPTION_VALS, map: TOUR_OPTIONS } }) + toHireMeta = super(self.json_schema[BAND_SEARCH_TYPE_VALS[1]], + { keys: HIRE_SORT_VALS, map: HIRE_SORT_ORDERS }) + toHireMeta.merge!({}) @@search_meta = { BAND_SEARCH_TYPE_VALS[0] => toJoinMeta, - BAND_SEARCH_TYPE_VALS[1] => super(self.json_schema[BAND_SEARCH_TYPE_VALS[1]], - { keys: HIRE_SORT_VALS, map: HIRE_SORT_ORDERS }), + BAND_SEARCH_TYPE_VALS[1] => toHireMeta, } end diff --git a/web/app/assets/javascripts/member_search_filter.js.coffee b/web/app/assets/javascripts/member_search_filter.js.coffee index 50d202289..cd7f99325 100644 --- a/web/app/assets/javascripts/member_search_filter.js.coffee +++ b/web/app/assets/javascripts/member_search_filter.js.coffee @@ -566,6 +566,9 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter this._populateTourOption() _populateSearchFilterToHire: () => + this._populateSkill() + this._populateGigs() + this._populatePerformSamples() loadSearchFilter: (sFilter) => super(sFilter) @@ -607,6 +610,9 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter _populateSortOrder: () => this._populateSelectIdentifier('sort_order') + _populatePerformSamples: () => + this._populateSelectIdentifier('perform_samples') + _populateGenres: () => super() diff --git a/web/app/views/clients/_band_search_filter.html.slim b/web/app/views/clients/_band_search_filter.html.slim index 31caf974b..ab45177a6 100644 --- a/web/app/views/clients/_band_search_filter.html.slim +++ b/web/app/views/clients/_band_search_filter.html.slim @@ -97,11 +97,30 @@ script#template-band-search-filter-to_hire type="text/template" table#search-filter-genres cellpadding="10" cellspacing="6" width="100%" .col-right - .field - label for="search-filter-instruments" - | Instruments & Skill Level: - .search-filter-setup-instruments.band-setup-genres.builder-instruments - table#search-filter-instruments cellpadding="10" cellspacing="6" width="100%" + .field.builder-selector + label Status: + select.easydropdown name="skill_level" + option selected="selected" value="{skill_level}" {skill_level} + + .field.builder-selector + label Concert Gigs Played: + select.easydropdown name="concert_gigs" + option selected="selected" value="{concert_gigs}" {concert_gigs} + + .field.builder-selector + label Performance Sample Available: + select.easydropdown name="perform_samples" + option selected="selected" value="{perform_samples}" {perform_samples} + + .field.builder-selector + input type="checkbox" id="max_cost" name="{max_cost}" + | Find bands to play a paid gig at a cost not to exceed + input type="text" id="max_cost_amount" name="{max_cost}" + + .field.builder-selector + input type="checkbox" id="free_gigs" name="{free_gigs}" + | Find bands that will play free gigs + .clearall .band-search-filter-builder-middle2.builder-section