Added year to showed creation date and ordered by date DESC

Backported from AyuntamientoMadrid/consul fork
This commit is contained in:
María Checa
2018-04-16 18:02:55 +02:00
committed by Marko Lovic
parent 7053711269
commit 4d355f3531
4 changed files with 25 additions and 12 deletions

View File

@@ -1,7 +1,7 @@
class Admin::SignatureSheetsController < Admin::BaseController class Admin::SignatureSheetsController < Admin::BaseController
def index def index
@signature_sheets = SignatureSheet.all @signature_sheets = SignatureSheet.all.order(created_at: :desc)
end end
def new def new
@@ -29,4 +29,4 @@ class Admin::SignatureSheetsController < Admin::BaseController
params.require(:signature_sheet).permit(:signable_type, :signable_id, :document_numbers) params.require(:signature_sheet).permit(:signable_type, :signable_id, :document_numbers)
end end
end end

View File

@@ -19,7 +19,7 @@
<%= signature_sheet.author.name %> <%= signature_sheet.author.name %>
</td> </td>
<td> <td>
<%= l(signature_sheet.created_at, format: :short) %> <%= l(signature_sheet.created_at, format: :long) %>
</td> </td>
</tr> </tr>
<% end %> <% end %>

View File

@@ -2,7 +2,7 @@
<div class="callout secondary float-right"> <div class="callout secondary float-right">
<%= t("admin.signature_sheets.show.created_at") %> <%= t("admin.signature_sheets.show.created_at") %>
<strong><%= l(@signature_sheet.created_at, format: :short) %></strong> <strong><%= l(@signature_sheet.created_at, format: :long) %></strong>
<span class="bullet">&nbsp;&bull;&nbsp;</span> <span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= t("admin.signature_sheets.show.author") %> <%= t("admin.signature_sheets.show.author") %>
<strong><%= @signature_sheet.author.name %></strong> <strong><%= @signature_sheet.author.name %></strong>
@@ -41,4 +41,4 @@
<div class="callout primary margin-top"> <div class="callout primary margin-top">
<%= t("admin.signature_sheets.show.loading") %> <%= t("admin.signature_sheets.show.loading") %>
</div> </div>
<% end %> <% end %>

View File

@@ -7,15 +7,28 @@ feature 'Signature sheets' do
login_as(admin.user) login_as(admin.user)
end end
scenario "Index" do context "Index" do
3.times { create(:signature_sheet) } scenario 'Lists all signature_sheets' do
3.times { create(:signature_sheet) }
visit admin_signature_sheets_path visit admin_signature_sheets_path
expect(page).to have_css(".signature_sheet", count: 3) expect(page).to have_css(".signature_sheet", count: 3)
SignatureSheet.all.each do |signature_sheet| SignatureSheet.all.each do |signature_sheet|
expect(page).to have_content signature_sheet.name expect(page).to have_content signature_sheet.name
end
end
scenario 'Orders signature_sheets by created_at DESC' do
signature_sheet1 = create(:signature_sheet)
signature_sheet2 = create(:signature_sheet)
signature_sheet3 = create(:signature_sheet)
visit admin_signature_sheets_path
expect(signature_sheet3.name).to appear_before(signature_sheet2.name)
expect(signature_sheet2.name).to appear_before(signature_sheet1.name)
end end
end end
@@ -78,7 +91,7 @@ feature 'Signature sheets' do
expect(page).to have_content "Citizen proposal #{proposal.id}" expect(page).to have_content "Citizen proposal #{proposal.id}"
expect(page).to have_content "12345678Z, 123A, 123B" expect(page).to have_content "12345678Z, 123A, 123B"
expect(page).to have_content signature_sheet.created_at.strftime("%d %b %H:%M") expect(page).to have_content signature_sheet.created_at.strftime("%B %d, %Y %H:%M")
expect(page).to have_content user.name expect(page).to have_content user.name
within("#document_count") do within("#document_count") do