From 3af55a3c149ef700aa2cd8cbd7f2a8c102eaa46b Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Thu, 21 May 2015 05:47:14 +0000 Subject: [PATCH] VRFS-3036 tohire builder --- ruby/lib/jam_ruby/models/band_search.rb | 6 ++++-- .../javascripts/member_search_filter.js.coffee | 12 +++++++++++- web/app/views/clients/_band_search_filter.html.slim | 8 +++----- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ruby/lib/jam_ruby/models/band_search.rb b/ruby/lib/jam_ruby/models/band_search.rb index bed8a2c26..272198c6f 100644 --- a/ruby/lib/jam_ruby/models/band_search.rb +++ b/ruby/lib/jam_ruby/models/band_search.rb @@ -81,7 +81,7 @@ module JamRuby KEY_GIGS => self::GIG_COUNTS[0].to_s, KEY_PERF_SAMPLES => self::PERF_SAMPLES[0].to_s, KEY_HIRE_MAX_COST => 0, - KEY_HIRE_FREE => 0, + KEY_HIRE_FREE => 1, }, } end @@ -96,7 +96,9 @@ module JamRuby }) toHireMeta = super(self.json_schema[BAND_SEARCH_TYPE_VALS[1]], { keys: HIRE_SORT_VALS, map: HIRE_SORT_ORDERS }) - toHireMeta.merge!({}) + toHireMeta.merge!({ + KEY_PERF_SAMPLES => { keys: PERF_SAMPLES_VALS, map: PERF_SAMPLES }, + }) @@search_meta = { BAND_SEARCH_TYPE_VALS[0] => toJoinMeta, BAND_SEARCH_TYPE_VALS[1] => toHireMeta, diff --git a/web/app/assets/javascripts/member_search_filter.js.coffee b/web/app/assets/javascripts/member_search_filter.js.coffee index cd7f99325..5dec03b88 100644 --- a/web/app/assets/javascripts/member_search_filter.js.coffee +++ b/web/app/assets/javascripts/member_search_filter.js.coffee @@ -550,12 +550,22 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter concert_gigs: this.filterData().concert_gigs _searchFilterArgsToHire: () => + if 0 < this.filterData().max_cost + has_max_cost = 'checked' + else + has_max_cost = '' + if 1==this.filterData().free_gigs + has_free_gigs = 'checked' + else + has_free_gigs = '' + args = skill_level: this.filterData().skill_level concert_gigs: this.filterData().concert_gigs perform_samples: this.filterData().perform_samples + has_max_cost: has_max_cost max_cost: this.filterData().max_cost - free_gigs: this.filterData().free_gigs + has_free_gigs: has_free_gigs _populateSearchFilterToJoin: () => this._populateInstruments() diff --git a/web/app/views/clients/_band_search_filter.html.slim b/web/app/views/clients/_band_search_filter.html.slim index ab45177a6..053cbe55d 100644 --- a/web/app/views/clients/_band_search_filter.html.slim +++ b/web/app/views/clients/_band_search_filter.html.slim @@ -113,13 +113,11 @@ script#template-band-search-filter-to_hire type="text/template" 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}" + Find bands to play a paid gig at a cost not to exceed + input type="text" id="max_cost_amount" name="max_cost" value="{max_cost}" .field.builder-selector - input type="checkbox" id="free_gigs" name="{free_gigs}" - | Find bands that will play free gigs + Find bands that will play free gigs .clearall