|
124 | 124 | <% end %> |
125 | 125 | <!-- Sectors --> |
126 | 126 | <% if @person.profile_show_sectors? %> |
127 | | - <% sectorable_items = @person.sectorable_items.includes(:sector).order("sectors.name") %> |
128 | | - <% primary_sector_items = sectorable_items.select(&:is_primary?) %> |
129 | | - <% additional_sector_items = sectorable_items.reject(&:is_primary?) %> |
| 127 | + <%# One combined list: the primary sector leads as a darker-green starred |
| 128 | + chip, followed by the additional sectors alphabetically and any |
| 129 | + free-text "Other" responses. %> |
| 130 | + <% sectorable_items = @person.sectorable_items.includes(:sector).sort_by { |si| [ si.is_primary? ? 0 : 1, si.sector&.name.to_s.downcase ] } %> |
130 | 131 | <% other_service_areas = @person.other_service_area_responses %> |
131 | 132 | <div class="md:col-span-2 p-3"> |
132 | | - <div class="grid grid-cols-1 sm:grid-cols-2 gap-4"> |
133 | | - <div> |
134 | | - <h2 class="text-lg font-semibold text-gray-800 mb-3">Primary sector</h2> |
135 | | - <% if primary_sector_items.any? || other_service_areas.any? %> |
136 | | - <div class="flex flex-wrap gap-2"> |
137 | | - <% primary_sector_items.each do |si| %> |
138 | | - <%= render "sectors/tagging_label", |
139 | | - sector: si.sector, |
140 | | - display_leader: true, |
141 | | - is_leader: si.is_leader %> |
142 | | - <% end %> |
143 | | - <%= render "people/other_responses", responses: other_service_areas %> |
144 | | - </div> |
145 | | - <% else %> |
146 | | - <p class="text-gray-500 italic">None selected.</p> |
| 133 | + <h2 class="text-lg font-semibold text-gray-800 mb-3">Sectors</h2> |
| 134 | + <% if sectorable_items.any? || other_service_areas.any? %> |
| 135 | + <div class="flex flex-wrap gap-2"> |
| 136 | + <% sectorable_items.each do |si| %> |
| 137 | + <%= render "sectors/tagging_label", |
| 138 | + sector: si.sector, |
| 139 | + is_primary: si.is_primary?, |
| 140 | + display_leader: true, |
| 141 | + is_leader: si.is_leader %> |
147 | 142 | <% end %> |
| 143 | + <%= render "people/other_responses", responses: other_service_areas %> |
148 | 144 | </div> |
149 | | - <div> |
150 | | - <h2 class="text-lg font-semibold text-gray-800 mb-3">Additional sectors</h2> |
151 | | - <% if additional_sector_items.any? %> |
152 | | - <div class="flex flex-wrap gap-2"> |
153 | | - <% additional_sector_items.each do |si| %> |
154 | | - <%= render "sectors/tagging_label", |
155 | | - sector: si.sector, |
156 | | - display_leader: true, |
157 | | - is_leader: si.is_leader %> |
158 | | - <% end %> |
159 | | - </div> |
160 | | - <% else %> |
161 | | - <p class="text-gray-500 italic">None selected.</p> |
162 | | - <% end %> |
163 | | - </div> |
164 | | - </div> |
| 145 | + <% else %> |
| 146 | + <p class="text-gray-500 italic">None selected.</p> |
| 147 | + <% end %> |
165 | 148 | </div> |
166 | 149 | <% end %> |
167 | 150 | </div> |
|
0 commit comments