Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add time stamp to uploaded column [#188974838] #1308

Merged
merged 2 commits into from
May 9, 2018
Merged

Add time stamp to uploaded column [#188974838] #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8803c8b
small tweak to Documents bstable
ying-pbrc Apr 30, 2018
31f62ec
typo
ying-pbrc Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/dashboard/documents/index.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ json.(@documents) do |doc|
json.id doc.id
json.type doc.display_document_type
json.title dashboard_display_document_title(doc, has_access_to_doc)
json.uploaded format_date(doc.document_updated_at)
json.uploaded format_datetime(doc.document_updated_at)
json.edit dashboard_document_edit_button(doc, has_access_to_doc)
json.delete dashboard_document_delete_button(doc, has_access_to_doc)
end
2 changes: 1 addition & 1 deletion app/views/documents/index.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ json.(@documents) do |doc|
json.id doc.id
json.type doc.display_document_type
json.title display_document_title(doc)
json.uploaded format_date(doc.document_updated_at)
json.uploaded format_datetime(doc.document_updated_at)
json.edit documents_edit_button(doc)
json.delete documents_delete_button(doc)
json.shared_with doc.sub_service_requests.map(&:organization).map(&:name).join('<br>')
Expand Down
2 changes: 1 addition & 1 deletion app/views/funding/services/_documents.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
= t(:funding)[:download][:application]

.bootstrap-table-dropdown-overflow
%table.custom_striped.bootstrap_table{id: "document-table", data: {pagination: 'true', 'page-size' => 20, toggle: 'table', search: "true", url: documents_funding_service_path(id: service.id, table: "loi", format: :json ), 'sort-name' => 'pi', 'sort-order' => 'asc', 'row-style' => 'documents_row_style'}}
%table.custom_striped.bootstrap_table{id: "document-table", data: {pagination: 'true', 'page-size' => 20, toggle: 'table', search: "true", url: documents_funding_service_path(id: service.id, table: "loi", format: :json ), striped: "true", 'sort-name' => 'pi', 'sort-order' => 'asc', 'row-style' => 'documents_row_style'}}
%thead.primary-header
%tr
%th{data: {class: 'col-sm-1 pi', align: "left", sortable: "true", field: "pi"}}
Expand Down
2 changes: 1 addition & 1 deletion app/views/funding/services/documents.json.jbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ json.(@funding_documents) do |document|
json.srid display_srid_link(ssr)
json.protocol ssr.protocol.title
json.doc_title display_document_title(document)
json.uploaded format_date(document.document_updated_at)
json.uploaded format_datetime(document.document_updated_at)
json.status PermissibleValue.get_value('status', ssr.status)
json.id ssr.id
end