From 1a91704532fdad7f4d7162328b0e552286e00b6d Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Wed, 20 May 2015 06:25:22 +0000 Subject: [PATCH] VRFS-3036 band search filters --- ruby/lib/jam_ruby/models/band_search.rb | 2 +- .../member_search_filter.js.coffee | 14 ++++-- .../clients/_band_search_filter.html.slim | 48 ++++++++++++++++--- 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/ruby/lib/jam_ruby/models/band_search.rb b/ruby/lib/jam_ruby/models/band_search.rb index c7a6c64dd..87c0a335a 100644 --- a/ruby/lib/jam_ruby/models/band_search.rb +++ b/ruby/lib/jam_ruby/models/band_search.rb @@ -60,7 +60,7 @@ module JamRuby TOUR_OPTIONS = { TOUR_OPTION_VALS[0] => 'Any', TOUR_OPTION_VALS[1] => 'Yes', - TOUR_OPTION_VALS[1] => 'No', + TOUR_OPTION_VALS[2] => 'No', } PERF_SAMPLES_VALS = TOUR_OPTION_VALS.clone diff --git a/web/app/assets/javascripts/member_search_filter.js.coffee b/web/app/assets/javascripts/member_search_filter.js.coffee index 06199b524..50d202289 100644 --- a/web/app/assets/javascripts/member_search_filter.js.coffee +++ b/web/app/assets/javascripts/member_search_filter.js.coffee @@ -83,11 +83,11 @@ context.JK.BaseSearchFilter = class BaseSearchFilter this._populateSelectIdentifier('sort_order') _populateSkill: () => - elem = $ '#musician-search-filter-builder select[name=skill_level]' + elem = $ '#'+@searchType+'-search-filter-builder select[name=skill_level]' this._populateSelectWithInt(@profileUtils.skillLevelMap, this.filterData().skill_level.toString(), elem) _populateGigs: () => - elem = $ '#musician-search-filter-builder select[name=concert_gigs]' + elem = $ '#'+@searchType+'-search-filter-builder select[name=concert_gigs]' this._populateSelectWithInt(@profileUtils.gigMap, this.filterData().concert_gigs.toString(), elem) _populateGenres: () => @@ -522,12 +522,18 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter this.showBuilderToHire() showBuilderToJoin: () => + @screen.find('.band-search-filter-builder-top-to_join').show() + @screen.find('.band-search-filter-builder-top-to_hire').hide() @searchSubType = 'to_join' this.showBuilder() + this._loadSearchFilter() if @searchFilter showBuilderToHire: () => + @screen.find('.band-search-filter-builder-top-to_join').hide() + @screen.find('.band-search-filter-builder-top-to_hire').show() @searchSubType = 'to_hire' this.showBuilder() + this._loadSearchFilter() if @searchFilter searchMetaData: () => @searchMeta[@searchSubType] @@ -563,8 +569,10 @@ context.JK.BandSearchFilter = class BandSearchFilter extends BaseSearchFilter loadSearchFilter: (sFilter) => super(sFilter) - @searchFilter = JSON.parse(sFilter) + this._loadSearchFilter() + + _loadSearchFilter: () => switch @searchSubType when 'to_join' then args = this._searchFilterArgsToJoin() when 'to_hire' then args = this._searchFilterArgsToHire() diff --git a/web/app/views/clients/_band_search_filter.html.slim b/web/app/views/clients/_band_search_filter.html.slim index a80cd9f1d..31caf974b 100644 --- a/web/app/views/clients/_band_search_filter.html.slim +++ b/web/app/views/clients/_band_search_filter.html.slim @@ -4,7 +4,7 @@ div#band-search-filter-results.content-wrapper div#band-search-filter-results-header a#btn-band-search-builder-to_join.button-orange href="#" SEARCH FOR BAND TO JOIN - a#btn-band-search-reset-to_hire.button-grey href="#" SEARCH FOR BAND TO HIRE + a#btn-band-search-builder-to_hire.button-orange href="#" SEARCH FOR BAND TO HIRE div#band-search-filter-description div.clearall div#band-search-filter-spinner.spinner-large @@ -18,7 +18,7 @@ script#template-band-search-filter-to_join type="text/template" #bands-filter-to_join - #band-search-filter-builder-top.builder-section + .band-search-filter-builder-top.builder-section .col-left h2 search bands .col-right.builder-sort-order @@ -27,7 +27,7 @@ script#template-band-search-filter-to_join type="text/template" option selected="selected" value="{sort_order}" {sort_order} .clearall - #band-search-filter-builder-middle1.builder-section + .band-search-filter-builder-middle1.builder-section .col-left .field label for="search-filter-genres" Genres: @@ -37,12 +37,13 @@ script#template-band-search-filter-to_join type="text/template" .col-right .field label for="search-filter-instruments" - | Instruments & Skill Level: + | Looking for New Members with These Skills: .search-filter-setup-instruments.band-setup-genres.builder-instruments table#search-filter-instruments cellpadding="10" cellspacing="6" width="100%" + .clearall - #band-search-filter-builder-middle2.builder-section + .band-search-filter-builder-middle2.builder-section .col-left .field.builder-selector label Type: @@ -72,7 +73,42 @@ script#template-band-search-filter-to_join type="text/template" .clearall .clearall - #band-search-filter-builder-bottom.builder-section.builder-action-buttons + .band-search-filter-builder-bottom.builder-section.builder-action-buttons + .col-right + a#btn-perform-band-search.builder-button.button-orange href="#" SEARCH + a#btn-band-search-cancel.builder-button.button-grey href="#" CANCEL + +script#template-band-search-filter-to_hire type="text/template" + #bands-filter-to_hire + .band-search-filter-builder-top-to_hire.builder-section + .col-left + h2 search bands + .col-right.builder-sort-order + .text-label Sort Results By: + select.easydropdown name="sort_order" + option selected="selected" value="{sort_order}" {sort_order} + .clearall + + .band-search-filter-builder-middle1.builder-section + .col-left + .field + label for="search-filter-genres" Genres: + .search-filter-setup-genres.band-setup-genres + 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%" + .clearall + + .band-search-filter-builder-middle2.builder-section + .clearall + + .clearall + .band-search-filter-builder-bottom.builder-section.builder-action-buttons .col-right a#btn-perform-band-search.builder-button.button-orange href="#" SEARCH a#btn-band-search-cancel.builder-button.button-grey href="#" CANCEL