consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Order selected proposals by confidence score

Browse Source 
The same way we order budget results.
This commit is contained in:
Javi Martín
2018-09-26 12:50:48 +02:00
parent d9410a132a
commit 8976280493
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/legislation/processes_controller.rb
View File

@@ -1,6 +1,6 @@
class Legislation::ProcessesController < Legislation::BaseController class Legislation::ProcessesController < Legislation::BaseController
has_filters %w[open next past], only: :index has_filters %w[open next past], only: :index
has_filters %w[all selected], only: :proposals has_filters %w[random winners], only: :proposals
load_and_authorize_resource load_and_authorize_resource
@@ -93,7 +93,7 @@ class Legislation::ProcessesController < Legislation::BaseController
@proposals = ::Legislation::Proposal.where(process: @process) @proposals = ::Legislation::Proposal.where(process: @process)
@proposals = @proposals.search(params[:search]) if params[:search].present? @proposals = @proposals.search(params[:search]) if params[:search].present?
@proposals = @proposals.send(@current_filter).order('random()').page(params[:page]) @proposals = @proposals.send(@current_filter).page(params[:page])
if @process.proposals_phase.started? || (current_user && current_user.administrator?) if @process.proposals_phase.started? || (current_user && current_user.administrator?)
legislation_proposal_votes(@proposals) legislation_proposal_votes(@proposals)

2
app/models/legislation/proposal.rb
View File

@@ -52,6 +52,8 @@ class Legislation::Proposal < ActiveRecord::Base
scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) }
scope :last_week, -> { where("proposals.created_at >= ?", 7.days.ago)} scope :last_week, -> { where("proposals.created_at >= ?", 7.days.ago)}
scope :selected, -> { where(selected: true) } scope :selected, -> { where(selected: true) }
scope :random, -> { sort_by_random }
scope :winners, -> { selected.sort_by_confidence_score }
def to_param def to_param
"#{id}-#{title}".parameterize "#{id}-#{title}".parameterize

4
config/locales/en/legislation.yml
View File

@@ -53,8 +53,8 @@ en:
proposals: proposals:
empty_proposals: There are no proposals empty_proposals: There are no proposals
filters: filters:
all: All random: All
selected: Selected winners: Selected
debate: debate:
empty_questions: There aren't any questions empty_questions: There aren't any questions
participate: Participate in the debate participate: Participate in the debate

4
config/locales/es/legislation.yml
View File

@@ -53,8 +53,8 @@ es:
proposals: proposals:
empty_proposals: No hay propuestas empty_proposals: No hay propuestas
filters: filters:
all: Todos random: Todas
selected: Seleccionados winners: Seleccionadas
debate: debate:
empty_questions: No hay preguntas empty_questions: No hay preguntas
participate: Realiza tus aportaciones al debate previo participando en los siguientes temas. participate: Realiza tus aportaciones al debate previo participando en los siguientes temas.