From bd94a9ba84551f3dd0f993b7f52e3942f13920c3 Mon Sep 17 00:00:00 2001 From: shoma Date: Tue, 3 Mar 2026 17:46:22 +0900 Subject: [PATCH 01/13] =?UTF-8?q?datetime=E5=B1=9E=E6=80=A7=E3=81=AE?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E3=82=92=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/products/product_component.html.slim | 2 +- app/components/users/users_answer_component.html.slim | 2 +- app/javascript/components/BookmarksInDashboard.jsx | 4 +++- app/views/announcements/_announcement.html.slim | 2 +- app/views/announcements/show.html.slim | 2 +- .../_coding_test_submission.html.slim | 2 +- .../coding_tests/coding_test_submissions/show.html.slim | 2 +- app/views/current_user/bookmarks/_list.html.slim | 2 +- app/views/events/_event.html.slim | 2 +- app/views/events/_events.html.slim | 2 +- app/views/home/_announcement.html.slim | 2 +- app/views/home/_colleague_trainee_recent_report.html.slim | 2 +- app/views/movies/_movie_header.html.slim | 2 +- app/views/notifications/_notification.html.slim | 2 +- app/views/pages/_doc_header.html.slim | 4 ++-- app/views/products/_product.html.slim | 8 ++++---- app/views/products/_product_header.html.slim | 6 +++--- app/views/questions/_question_header.html.slim | 4 ++-- app/views/regular_events/_regular_event.html.slim | 2 +- app/views/reports/_product.html.slim | 6 +++--- app/views/reports/_report.html.slim | 4 ++-- app/views/users/_product.html.slim | 2 +- app/views/users/_reports.html.slim | 2 +- .../users/announcements/_wip_announcements.html.slim | 2 +- app/views/users/comments/_comment.html.slim | 2 +- app/views/users/events/_wip_events.html.slim | 2 +- app/views/users/events/index.html.slim | 2 +- app/views/users/pages/_wip_pages.html.slim | 2 +- app/views/users/products/_wip_products.html.slim | 2 +- app/views/users/questions/_wip_questions.html.slim | 2 +- app/views/users/reports/_wip_reports.html.slim | 2 +- app/views/watches/_watch.html.slim | 2 +- app/views/works/show.html.slim | 2 +- 33 files changed, 45 insertions(+), 43 deletions(-) diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim index 0be41bbc264..2101083f447 100644 --- a/app/components/products/product_component.html.slim +++ b/app/components/products/product_component.html.slim @@ -81,7 +81,7 @@ .card-list-item-meta__items .card-list-item-meta__item - if @product.user.training_ends_on - time.a-meta dateTime=@product.user.training_ends_on + time.a-meta dateTime=@product.user.training_ends_on.iso8601 span.a-meta__label | 研修終了日 span.a-meta__value diff --git a/app/components/users/users_answer_component.html.slim b/app/components/users/users_answer_component.html.slim index 5c51d10969c..a988c1c7f06 100644 --- a/app/components/users/users_answer_component.html.slim +++ b/app/components/users/users_answer_component.html.slim @@ -32,7 +32,7 @@ user_path(answer.question.user), class: 'a-user-name' .card-list-item-meta__item - time.a-meta datetime=answer.updated_at pubdate="pubdate" + time.a-meta datetime=answer.updated_at.iso8601 pubdate="pubdate" = formatted_updated_at - if best_answer? .answer-badge diff --git a/app/javascript/components/BookmarksInDashboard.jsx b/app/javascript/components/BookmarksInDashboard.jsx index 1fb2ebb1ccd..8cf81a7c63c 100644 --- a/app/javascript/components/BookmarksInDashboard.jsx +++ b/app/javascript/components/BookmarksInDashboard.jsx @@ -166,7 +166,9 @@ const Bookmark = ({ bookmark, editable, bookmarksUrl }) => {
-
diff --git a/app/views/announcements/_announcement.html.slim b/app/views/announcements/_announcement.html.slim index 4540ec0ef52..5eefce12859 100644 --- a/app/views/announcements/_announcement.html.slim +++ b/app/views/announcements/_announcement.html.slim @@ -25,7 +25,7 @@ .a-meta | お知らせ作成中 - else - time.a-meta(datetime='announcement.published_at_date_time') + time.a-meta(datetime="#{announcement.published_at.iso8601}") span.a-meta__label | 公開 span.a-meta__value diff --git a/app/views/announcements/show.html.slim b/app/views/announcements/show.html.slim index 0c40d1be1d6..c014d696a39 100644 --- a/app/views/announcements/show.html.slim +++ b/app/views/announcements/show.html.slim @@ -30,7 +30,7 @@ hr.a-border .page-content-header__end .page-content-header__row .page-content-header__before-title - time.a-meta(datetime="#{@announcement.created_at.to_datetime}" pubdate='pubdate') + time.a-meta(datetime="#{@announcement.created_at.iso8601}" pubdate='pubdate') = l @announcement.updated_at h1.page-content-header__title(class="#{@announcement.wip? ? 'is-wip' : ''}") - if @announcement.wip? diff --git a/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim b/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim index 507950dd509..ffa1c98daba 100644 --- a/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim +++ b/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim @@ -16,7 +16,7 @@ = link_to cts.user, class: 'a-user-name' do = cts.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{cts.updated_at}") + time.a-meta(datetime="#{cts.updated_at.iso8601}") = l cts.updated_at .card-list-item__row .a-long-text diff --git a/app/views/coding_tests/coding_test_submissions/show.html.slim b/app/views/coding_tests/coding_test_submissions/show.html.slim index 9b34c2a54c6..5876d87e6d3 100644 --- a/app/views/coding_tests/coding_test_submissions/show.html.slim +++ b/app/views/coding_tests/coding_test_submissions/show.html.slim @@ -54,7 +54,7 @@ ruby: .page-content-header-metas__meta .a-meta .a-meta__label 提出日 - time.a-meta__value(datetime="#{cts.created_at}" pubdate='pubdate') + time.a-meta__value(datetime="#{cts.created_at.iso8601}" pubdate='pubdate') = l cts.created_at .a-card diff --git a/app/views/current_user/bookmarks/_list.html.slim b/app/views/current_user/bookmarks/_list.html.slim index 2a4412f2a84..0fcdb692345 100644 --- a/app/views/current_user/bookmarks/_list.html.slim +++ b/app/views/current_user/bookmarks/_list.html.slim @@ -48,7 +48,7 @@ hr.a-border = "#{bookmark.bookmarkable.user.login_name}(#{bookmark.bookmarkable.user.name_kana})" .card-list-item-meta__item - date = bookmark.bookmarkable_type == 'Report' ? bookmark.bookmarkable.reported_on.to_time : bookmark.bookmarkable.created_at - time.a-meta datetime=date + time.a-meta datetime=date.iso8601 = l(date, format: :default) .card-list-item__option diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim index e12f9c72e99..cd826112061 100644 --- a/app/views/events/_event.html.slim +++ b/app/views/events/_event.html.slim @@ -22,7 +22,7 @@ = event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{event.created_at.to_datetime}" pubdate='pubdate') + time.a-meta__value(datetime="#{event.created_at.iso8601}" pubdate='pubdate') = l event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/events/_events.html.slim b/app/views/events/_events.html.slim index 3327ef9a11c..c1d1e211788 100644 --- a/app/views/events/_events.html.slim +++ b/app/views/events/_events.html.slim @@ -26,7 +26,7 @@ ul.card-list.a-card .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime=event.start_at) + time.a-meta(datetime=event.start_at.iso8601) span.a-meta__label 開催日時 span.a-meta__value = l event.start_at .card-list-item-meta__item diff --git a/app/views/home/_announcement.html.slim b/app/views/home/_announcement.html.slim index c9fc8c1bcc6..c6902a3035e 100644 --- a/app/views/home/_announcement.html.slim +++ b/app/views/home/_announcement.html.slim @@ -17,5 +17,5 @@ // TODOエラー回避のためにつけたので不要になったら削除 - if announcement.published_at? .card-list-item-meta__item - time.a-meta(datetime="#{announcement.published_at.to_datetime}" pubdate='pubdate') + time.a-meta(datetime="#{announcement.published_at.iso8601}" pubdate='pubdate') = l announcement.published_at diff --git a/app/views/home/_colleague_trainee_recent_report.html.slim b/app/views/home/_colleague_trainee_recent_report.html.slim index c79c28cbc0f..88c3088c641 100644 --- a/app/views/home/_colleague_trainee_recent_report.html.slim +++ b/app/views/home/_colleague_trainee_recent_report.html.slim @@ -16,6 +16,6 @@ = link_to user_path(report.user), class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.to_datetime}") + time.a-meta(datetime="#{report.reported_on.to_time.iso8601}") = l report.reported_on | の日報 diff --git a/app/views/movies/_movie_header.html.slim b/app/views/movies/_movie_header.html.slim index 99548df8111..b2656eef695 100644 --- a/app/views/movies/_movie_header.html.slim +++ b/app/views/movies/_movie_header.html.slim @@ -37,7 +37,7 @@ header.page-content-header span.a-meta__label | 公開 .a-meta__value - time(datetime="#{movie.published_at.to_datetime}") + time(datetime="#{movie.published_at.iso8601}") | #{l movie.published_at} - if movie.user = render 'users/icon', diff --git a/app/views/notifications/_notification.html.slim b/app/views/notifications/_notification.html.slim index 35b2062e900..afc531d9b3b 100644 --- a/app/views/notifications/_notification.html.slim +++ b/app/views/notifications/_notification.html.slim @@ -26,5 +26,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta dateTime=notification.created_at + time.a-meta dateTime=notification.created_at.iso8601 = l(notification.created_at, format: :long) diff --git a/app/views/pages/_doc_header.html.slim b/app/views/pages/_doc_header.html.slim index 355b3aa989e..645a4a54869 100644 --- a/app/views/pages/_doc_header.html.slim +++ b/app/views/pages/_doc_header.html.slim @@ -32,7 +32,7 @@ header.page-content-header span.a-meta__label | 公開 .a-meta__value - time(datetime="#{page.published_at.to_datetime}") + time(datetime="#{page.published_at.iso8601}") | #{l page.published_at} = render 'users/icon', user: page.user, @@ -47,7 +47,7 @@ header.page-content-header span.a-meta__label | 更新 span.a-meta__value - time(datetime="#{page.updated_at.to_datetime}") + time(datetime="#{page.updated_at.iso8601}") | #{l page.updated_at} = render 'users/icon', user: page.last_updated_user, diff --git a/app/views/products/_product.html.slim b/app/views/products/_product.html.slim index 65faf7a1cce..5d08994ae4e 100644 --- a/app/views/products/_product.html.slim +++ b/app/views/products/_product.html.slim @@ -24,13 +24,13 @@ .a-meta | 提出物作成中 - elsif product.published_at.present? - time.a-meta(datetime="#{product.published_at.to_datetime}") + time.a-meta(datetime="#{product.published_at.iso8601}") span.a-meta__label | 提出 span.a-meta__value = l product.published_at - else - time.a-meta(datetime="#{product.created_at.to_datetime}") + time.a-meta(datetime="#{product.created_at.iso8601}") span.a-meta__label | 提出 span.a-meta__value @@ -38,7 +38,7 @@ - if product.updated_at.present? .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at.to_datetime}") + time.a-meta(datetime="#{product.updated_at.iso8601}") span.a-meta__label | 更新 span.a-meta__value @@ -59,7 +59,7 @@ as: :user, cached: true .card-list-item-meta__item - time.a-meta(datetime="#{product.commented_users.last.created_at.to_datetime}") + time.a-meta(datetime="#{product.commented_users.last.created_at.iso8601}") | 〜 #{l product.comments.last.created_at, format: :date_and_time} - if !current_user.adviser? && product.practice.open_product? .card-list-item__row diff --git a/app/views/products/_product_header.html.slim b/app/views/products/_product_header.html.slim index 3e00668c539..5de836ef4a2 100644 --- a/app/views/products/_product_header.html.slim +++ b/app/views/products/_product_header.html.slim @@ -53,12 +53,12 @@ header.page-content-header.is-product - elsif product.published_at.present? span.a-meta__label | 提出 - time.a-meta__value(datetime="#{product.published_at.to_datetime}") + time.a-meta__value(datetime="#{product.published_at.iso8601}") = l product.published_at - else span.a-meta__label | 提出 - time.a-meta__value(datetime="#{product.created_at.to_datetime}") + time.a-meta__value(datetime="#{product.created_at.iso8601}") = l product.created_at - if product.updated_at.present? @@ -66,7 +66,7 @@ header.page-content-header.is-product .a-meta span.a-meta__label | 更新 - time.a-meta__value(datetime="#{product.updated_at.to_datetime}") + time.a-meta__value(datetime="#{product.updated_at.iso8601}") = l product.updated_at .page-content-header-metas__end diff --git a/app/views/questions/_question_header.html.slim b/app/views/questions/_question_header.html.slim index 8070735d4ac..fe46aa3656b 100644 --- a/app/views/questions/_question_header.html.slim +++ b/app/views/questions/_question_header.html.slim @@ -46,14 +46,14 @@ header.page-content-header span.a-meta__label | 公開 span.a-meta__value - time(datetime="#{question.published_at.to_datetime}") + time(datetime="#{question.published_at.iso8601}") | #{l question.published_at} .page-content-header-metas__meta .a-meta span.a-meta__label | 更新 time.a-meta__value - time(datetime="#{question.updated_at.to_datetime}") + time(datetime="#{question.updated_at.iso8601}") | #{l question.updated_at} .page-content-header__row diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index de7ac8858cb..db638852f0f 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -20,7 +20,7 @@ = regular_event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{regular_event.created_at.to_datetime}" pubdate='pubdate') + time.a-meta__value(datetime="#{regular_event.created_at.iso8601}" pubdate='pubdate') = l regular_event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/reports/_product.html.slim b/app/views/reports/_product.html.slim index 7fd36684499..061a853b84f 100644 --- a/app/views/reports/_product.html.slim +++ b/app/views/reports/_product.html.slim @@ -18,9 +18,9 @@ .card-list-item-meta__items .card-list-item-meta__item - if product.published_at.nil? - time.a-meta(datetime="#{product.created_at.to_datetime}") + time.a-meta(datetime="#{product.created_at.iso8601}") - else - time.a-meta(datetime="#{product.published_at.to_datetime}") + time.a-meta(datetime="#{product.published_at.iso8601}") = l product.published_at = 'の提出物' - if product.comments.any? @@ -35,7 +35,7 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: product.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{product.comments.last.updated_at.to_datetime}" pubdate='pubdate') + time.a-meta(datetime="#{product.comments.last.updated_at.iso8601}" pubdate='pubdate') | 〜 #{l product.comments.last.updated_at, format: :date_and_time} - if product.checks.any? diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim index 09aa68f8c4e..4ee2d586e6c 100644 --- a/app/views/reports/_report.html.slim +++ b/app/views/reports/_report.html.slim @@ -37,7 +37,7 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.to_datetime}") + time.a-meta(datetime="#{report.reported_on.to_time.iso8601}") = l report.reported_on | の日報 - if report.comments.any? @@ -52,7 +52,7 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: report.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{report.comments.last.updated_at.to_datetime}" pubdate='pubdate') + time.a-meta(datetime="#{report.comments.last.updated_at.iso8601}" pubdate='pubdate') | 〜 #{l report.comments.last.updated_at, format: :date_and_time} - if report.checks.any? diff --git a/app/views/users/_product.html.slim b/app/views/users/_product.html.slim index 8bac8cdc832..e4d5b682886 100644 --- a/app/views/users/_product.html.slim +++ b/app/views/users/_product.html.slim @@ -1,7 +1,7 @@ .user-reports-item = link_to [product.practice, product], itemprop: 'url', class: 'user-reports-item__link' do h3.user-reports-item__title(itemprop='name') = product.title - time.user-reports-item__updated-at(datetime="#{product.updated_at.to_datetime}" pubdate='pubdate') + time.user-reports-item__updated-at(datetime="#{product.updated_at.iso8601}" pubdate='pubdate') = l product.updated_at - if product.comments.any? .user-reports-item__comment-count diff --git a/app/views/users/_reports.html.slim b/app/views/users/_reports.html.slim index 8b42fc44d90..20ab6818f1f 100644 --- a/app/views/users/_reports.html.slim +++ b/app/views/users/_reports.html.slim @@ -4,7 +4,7 @@ .user-reports-item = link_to report, itemprop: 'url', class: 'user-reports-item__link' do h3.user-reports-item__title(itemprop='name') = report.title - time.user-reports-item__updated-at(datetime="#{report.updated_at.to_datetime}" pubdate='pubdate') + time.user-reports-item__updated-at(datetime="#{report.updated_at.iso8601}" pubdate='pubdate') = l report.updated_at - if report.comments.any? .user-reports-item__comment-count diff --git a/app/views/users/announcements/_wip_announcements.html.slim b/app/views/users/announcements/_wip_announcements.html.slim index 15544d95a89..c257bed70d1 100644 --- a/app/views/users/announcements/_wip_announcements.html.slim +++ b/app/views/users/announcements/_wip_announcements.html.slim @@ -14,5 +14,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{announcement.updated_at}") + time.a-meta(datetime="#{announcement.updated_at.iso8601}") = l announcement.updated_at diff --git a/app/views/users/comments/_comment.html.slim b/app/views/users/comments/_comment.html.slim index ea7bb9d3d44..0bd772a0feb 100644 --- a/app/views/users/comments/_comment.html.slim +++ b/app/views/users/comments/_comment.html.slim @@ -29,7 +29,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{commentable.created_at.to_datetime}" pubdate='pubdate') + time.a-meta(datetime="#{commentable.created_at.iso8601}" pubdate='pubdate') = l comment.updated_at .card-list-item__row .card-list-item__summary diff --git a/app/views/users/events/_wip_events.html.slim b/app/views/users/events/_wip_events.html.slim index 10d0b392726..274a5519082 100644 --- a/app/views/users/events/_wip_events.html.slim +++ b/app/views/users/events/_wip_events.html.slim @@ -14,5 +14,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{event.updated_at}") + time.a-meta(datetime="#{event.updated_at.iso8601}") = l event.updated_at diff --git a/app/views/users/events/index.html.slim b/app/views/users/events/index.html.slim index deb9c99791a..ba76c834494 100644 --- a/app/views/users/events/index.html.slim +++ b/app/views/users/events/index.html.slim @@ -43,7 +43,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{event.start_at}") + time.a-meta(datetime="#{event.start_at.iso8601}") | 開催日時:#{l event.start_at} .card-list-item-meta__item .a-meta diff --git a/app/views/users/pages/_wip_pages.html.slim b/app/views/users/pages/_wip_pages.html.slim index ee4c07447b7..fd2fd472d65 100644 --- a/app/views/users/pages/_wip_pages.html.slim +++ b/app/views/users/pages/_wip_pages.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{page.updated_at}") + time.a-meta(datetime="#{page.updated_at.iso8601}") = l page.updated_at diff --git a/app/views/users/products/_wip_products.html.slim b/app/views/users/products/_wip_products.html.slim index 5210c36ef15..5988ad817ef 100644 --- a/app/views/users/products/_wip_products.html.slim +++ b/app/views/users/products/_wip_products.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at}") + time.a-meta(datetime="#{product.updated_at.iso8601}") = l product.updated_at diff --git a/app/views/users/questions/_wip_questions.html.slim b/app/views/users/questions/_wip_questions.html.slim index d7bd4549e18..db29b67647c 100644 --- a/app/views/users/questions/_wip_questions.html.slim +++ b/app/views/users/questions/_wip_questions.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{question.updated_at}") + time.a-meta(datetime="#{question.updated_at.iso8601}") = l question.updated_at diff --git a/app/views/users/reports/_wip_reports.html.slim b/app/views/users/reports/_wip_reports.html.slim index 9554ef1b0a7..3b43ec7213b 100644 --- a/app/views/users/reports/_wip_reports.html.slim +++ b/app/views/users/reports/_wip_reports.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{report.updated_at}") + time.a-meta(datetime="#{report.updated_at.iso8601}") = l report.updated_at diff --git a/app/views/watches/_watch.html.slim b/app/views/watches/_watch.html.slim index 4147e0ef97a..3f38a83e7c5 100644 --- a/app/views/watches/_watch.html.slim +++ b/app/views/watches/_watch.html.slim @@ -38,7 +38,7 @@ = link_to watchable.user, class: 'a-user-name' do = watchable.user.login_name .card-list-item-meta__item - time.a-meta(datetime="#{watchable.created_at}") + time.a-meta(datetime="#{watchable.created_at.iso8601}") = l watchable.created_at .card-list-item__option.hidden .a-watch-button.a-button.is-sm.is-block.is-main data-watch_id="#{watch.id}" diff --git a/app/views/works/show.html.slim b/app/views/works/show.html.slim index 380f67e67b2..1702a7684e0 100644 --- a/app/views/works/show.html.slim +++ b/app/views/works/show.html.slim @@ -41,7 +41,7 @@ hr.a-border .a-meta .a-meta__label | 登録日 - time.a-meta__value(datetime="#{@work.created_at.to_datetime}" pubdate='pubdate') + time.a-meta__value(datetime="#{@work.created_at.iso8601}" pubdate='pubdate') = l @work.created_at .a-card From 890683d0347f581d922293189f269d1a9d4c5d7f Mon Sep 17 00:00:00 2001 From: shoma Date: Wed, 4 Mar 2026 17:22:45 +0900 Subject: [PATCH 02/13] =?UTF-8?q?datetime=E5=B1=9E=E6=80=A7=E3=81=AE?= =?UTF-8?q?=E5=80=A4=E3=81=A8=E7=94=BB=E9=9D=A2=E8=A1=A8=E8=A8=98=E3=81=AE?= =?UTF-8?q?=E5=80=A4=E3=82=92=E4=B8=80=E8=87=B4=E3=81=95=E3=81=9B=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/announcements/show.html.slim | 2 +- app/views/events/_event.html.slim | 2 +- app/views/home/_colleague_trainee_recent_report.html.slim | 2 +- app/views/products/_product.html.slim | 2 +- app/views/regular_events/_regular_event.html.slim | 2 +- app/views/users/comments/_comment.html.slim | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/announcements/show.html.slim b/app/views/announcements/show.html.slim index c014d696a39..91ed1acc882 100644 --- a/app/views/announcements/show.html.slim +++ b/app/views/announcements/show.html.slim @@ -30,7 +30,7 @@ hr.a-border .page-content-header__end .page-content-header__row .page-content-header__before-title - time.a-meta(datetime="#{@announcement.created_at.iso8601}" pubdate='pubdate') + time.a-meta(datetime="#{@announcement.updated_at.iso8601}" pubdate='pubdate') = l @announcement.updated_at h1.page-content-header__title(class="#{@announcement.wip? ? 'is-wip' : ''}") - if @announcement.wip? diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim index cd826112061..b73d3cb604c 100644 --- a/app/views/events/_event.html.slim +++ b/app/views/events/_event.html.slim @@ -22,7 +22,7 @@ = event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{event.created_at.iso8601}" pubdate='pubdate') + time.a-meta__value(datetime="#{event.updated_at.iso8601}" pubdate='pubdate') = l event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/home/_colleague_trainee_recent_report.html.slim b/app/views/home/_colleague_trainee_recent_report.html.slim index 88c3088c641..45ff04fc167 100644 --- a/app/views/home/_colleague_trainee_recent_report.html.slim +++ b/app/views/home/_colleague_trainee_recent_report.html.slim @@ -16,6 +16,6 @@ = link_to user_path(report.user), class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.to_time.iso8601}") + time.a-meta(datetime="#{report.reported_on.in_time_zone.iso8601}") = l report.reported_on | の日報 diff --git a/app/views/products/_product.html.slim b/app/views/products/_product.html.slim index 5d08994ae4e..2e855c6f8da 100644 --- a/app/views/products/_product.html.slim +++ b/app/views/products/_product.html.slim @@ -59,7 +59,7 @@ as: :user, cached: true .card-list-item-meta__item - time.a-meta(datetime="#{product.commented_users.last.created_at.iso8601}") + time.a-meta(datetime="#{product.comments.last.created_at.iso8601}") | 〜 #{l product.comments.last.created_at, format: :date_and_time} - if !current_user.adviser? && product.practice.open_product? .card-list-item__row diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index db638852f0f..97e6f750e63 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -20,7 +20,7 @@ = regular_event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{regular_event.created_at.iso8601}" pubdate='pubdate') + time.a-meta__value(datetime="#{regular_event.updated_at.iso8601}" pubdate='pubdate') = l regular_event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/users/comments/_comment.html.slim b/app/views/users/comments/_comment.html.slim index 0bd772a0feb..b2a62d9257a 100644 --- a/app/views/users/comments/_comment.html.slim +++ b/app/views/users/comments/_comment.html.slim @@ -29,7 +29,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{commentable.created_at.iso8601}" pubdate='pubdate') + time.a-meta(datetime="#{comment.updated_at.iso8601}" pubdate='pubdate') = l comment.updated_at .card-list-item__row .card-list-item__summary From 92f5af7bf87daa0effe8d6d11b6b799a4dbe7d97 Mon Sep 17 00:00:00 2001 From: shoma Date: Thu, 5 Mar 2026 11:33:18 +0900 Subject: [PATCH 03/13] =?UTF-8?q?component=E3=81=AEdatetime=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E3=81=8B=E3=82=89.iso8601=E3=81=A8=E3=81=84=E3=81=86?= =?UTF-8?q?=E8=A8=98=E8=BF=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit APIレスポンスの際にISO8601形式にシリアライズされているため、.iso8601は呼び出せない --- app/javascript/components/BookmarksInDashboard.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/javascript/components/BookmarksInDashboard.jsx b/app/javascript/components/BookmarksInDashboard.jsx index 8cf81a7c63c..1fb2ebb1ccd 100644 --- a/app/javascript/components/BookmarksInDashboard.jsx +++ b/app/javascript/components/BookmarksInDashboard.jsx @@ -166,9 +166,7 @@ const Bookmark = ({ bookmark, editable, bookmarksUrl }) => {
-
From e169d4c4f7eef61c414dbadf83d22fbde6705b5c Mon Sep 17 00:00:00 2001 From: shoma Date: Mon, 9 Mar 2026 09:26:03 +0900 Subject: [PATCH 04/13] =?UTF-8?q?to=5Ftime=E3=82=92in=5Ftime=5Fzone?= =?UTF-8?q?=E3=81=AB=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to_timeはDate型フィールドの変換を行う際にタイムゾーンを無視してしまうため修正した --- app/views/current_user/bookmarks/_list.html.slim | 2 +- app/views/reports/_report.html.slim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/current_user/bookmarks/_list.html.slim b/app/views/current_user/bookmarks/_list.html.slim index 0fcdb692345..7d0f0eab9b0 100644 --- a/app/views/current_user/bookmarks/_list.html.slim +++ b/app/views/current_user/bookmarks/_list.html.slim @@ -47,7 +47,7 @@ hr.a-border = link_to bookmark.bookmarkable.user.url, class: 'a-user-name' do = "#{bookmark.bookmarkable.user.login_name}(#{bookmark.bookmarkable.user.name_kana})" .card-list-item-meta__item - - date = bookmark.bookmarkable_type == 'Report' ? bookmark.bookmarkable.reported_on.to_time : bookmark.bookmarkable.created_at + - date = bookmark.bookmarkable_type == 'Report' ? bookmark.bookmarkable.reported_on.in_time_zone : bookmark.bookmarkable.created_at time.a-meta datetime=date.iso8601 = l(date, format: :default) diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim index 4ee2d586e6c..33b8bb35b5c 100644 --- a/app/views/reports/_report.html.slim +++ b/app/views/reports/_report.html.slim @@ -37,7 +37,7 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.to_time.iso8601}") + time.a-meta(datetime="#{report.reported_on.in_time_zone.iso8601}") = l report.reported_on | の日報 - if report.comments.any? From ce6074f9f637f91df20e0b8f89203f24c550707c Mon Sep 17 00:00:00 2001 From: shoma Date: Mon, 9 Mar 2026 09:37:41 +0900 Subject: [PATCH 05/13] =?UTF-8?q?training=5Fends=5Fon=E3=82=92iso8601?= =?UTF-8?q?=E3=81=AE=E5=BD=A2=E5=BC=8F=E3=81=A7=E3=83=AC=E3=82=B9=E3=83=9D?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/api/products/_product.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/api/products/_product.json.jbuilder b/app/views/api/products/_product.json.jbuilder index 8f2ab0717ad..b898c7f1902 100644 --- a/app/views/api/products/_product.json.jbuilder +++ b/app/views/api/products/_product.json.jbuilder @@ -31,6 +31,7 @@ json.user do json.partial! "api/users/user", user: product.user if product.user.training_ends_on json.training_ends_on l(product.user.training_ends_on) + json.training_ends_on_date_time product.user.training_ends_on.iso8601 json.training_remaining_days product.user.training_remaining_days end end From b6433e86f1bb17cd34a57700ba18fab3f22bc3d6 Mon Sep 17 00:00:00 2001 From: shoma Date: Mon, 9 Mar 2026 10:34:04 +0900 Subject: [PATCH 06/13] =?UTF-8?q?training=5Fends=5Fon=E3=81=AFdate?= =?UTF-8?q?=E5=9E=8B=E3=81=A7=E3=81=82=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81?= =?UTF-8?q?datetime=E5=B1=9E=E6=80=A7=E3=81=8C=E6=9C=9F=E5=BE=85=E3=81=99?= =?UTF-8?q?=E3=82=8B=E5=BD=A2=E5=BC=8F=E3=81=AB=E5=A4=89=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/products/product_component.html.slim | 2 +- app/views/api/products/_product.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim index 2101083f447..e311623cd06 100644 --- a/app/components/products/product_component.html.slim +++ b/app/components/products/product_component.html.slim @@ -81,7 +81,7 @@ .card-list-item-meta__items .card-list-item-meta__item - if @product.user.training_ends_on - time.a-meta dateTime=@product.user.training_ends_on.iso8601 + time.a-meta dateTime=@product.user.training_ends_on.in_time_zone.iso8601 span.a-meta__label | 研修終了日 span.a-meta__value diff --git a/app/views/api/products/_product.json.jbuilder b/app/views/api/products/_product.json.jbuilder index b898c7f1902..c11f83effb4 100644 --- a/app/views/api/products/_product.json.jbuilder +++ b/app/views/api/products/_product.json.jbuilder @@ -31,7 +31,7 @@ json.user do json.partial! "api/users/user", user: product.user if product.user.training_ends_on json.training_ends_on l(product.user.training_ends_on) - json.training_ends_on_date_time product.user.training_ends_on.iso8601 + json.training_ends_on_date_time product.user.training_ends_on.in_time_zone.iso8601 json.training_remaining_days product.user.training_remaining_days end end From 295b8f05a22d330ed8ed451e18aa63d75dbb6ea1 Mon Sep 17 00:00:00 2001 From: shoma Date: Fri, 27 Mar 2026 13:14:20 +0900 Subject: [PATCH 07/13] =?UTF-8?q?pubdate=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 現在は廃止されているため --- app/components/searchable_component.html.slim | 2 +- app/components/users/users_answer_component.html.slim | 2 +- app/views/announcements/show.html.slim | 2 +- app/views/coding_tests/coding_test_submissions/show.html.slim | 2 +- app/views/events/_event.html.slim | 2 +- app/views/home/_announcement.html.slim | 2 +- app/views/regular_events/_regular_event.html.slim | 2 +- app/views/reports/_product.html.slim | 2 +- app/views/reports/_report.html.slim | 2 +- app/views/users/_product.html.slim | 2 +- app/views/users/_reports.html.slim | 2 +- app/views/users/comments/_comment.html.slim | 2 +- app/views/works/show.html.slim | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/components/searchable_component.html.slim b/app/components/searchable_component.html.slim index f77fd187f05..d84ded21934 100644 --- a/app/components/searchable_component.html.slim +++ b/app/components/searchable_component.html.slim @@ -44,7 +44,7 @@ = image_tag resource_user.avatar_url, class: 'card-list-item-meta__icon a-user-icon' = link_to resource_user.login_name, resource_user, class: 'a-user-name' .card-list-item-meta__item - time.a-meta datetime=resource.updated_at.iso8601 pubdate='pubdate' + time.a-meta datetime=resource.updated_at.iso8601 = l(resource.updated_at) .card-list-item-meta__item .a-meta diff --git a/app/components/users/users_answer_component.html.slim b/app/components/users/users_answer_component.html.slim index a988c1c7f06..9c43b807576 100644 --- a/app/components/users/users_answer_component.html.slim +++ b/app/components/users/users_answer_component.html.slim @@ -32,7 +32,7 @@ user_path(answer.question.user), class: 'a-user-name' .card-list-item-meta__item - time.a-meta datetime=answer.updated_at.iso8601 pubdate="pubdate" + time.a-meta datetime=answer.updated_at.iso8601 = formatted_updated_at - if best_answer? .answer-badge diff --git a/app/views/announcements/show.html.slim b/app/views/announcements/show.html.slim index 91ed1acc882..6e6e701b1cb 100644 --- a/app/views/announcements/show.html.slim +++ b/app/views/announcements/show.html.slim @@ -30,7 +30,7 @@ hr.a-border .page-content-header__end .page-content-header__row .page-content-header__before-title - time.a-meta(datetime="#{@announcement.updated_at.iso8601}" pubdate='pubdate') + time.a-meta(datetime="#{@announcement.updated_at.iso8601}") = l @announcement.updated_at h1.page-content-header__title(class="#{@announcement.wip? ? 'is-wip' : ''}") - if @announcement.wip? diff --git a/app/views/coding_tests/coding_test_submissions/show.html.slim b/app/views/coding_tests/coding_test_submissions/show.html.slim index 5876d87e6d3..964d5a390a7 100644 --- a/app/views/coding_tests/coding_test_submissions/show.html.slim +++ b/app/views/coding_tests/coding_test_submissions/show.html.slim @@ -54,7 +54,7 @@ ruby: .page-content-header-metas__meta .a-meta .a-meta__label 提出日 - time.a-meta__value(datetime="#{cts.created_at.iso8601}" pubdate='pubdate') + time.a-meta__value(datetime="#{cts.created_at.iso8601}") = l cts.created_at .a-card diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim index b73d3cb604c..fd1be2a5f65 100644 --- a/app/views/events/_event.html.slim +++ b/app/views/events/_event.html.slim @@ -22,7 +22,7 @@ = event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{event.updated_at.iso8601}" pubdate='pubdate') + time.a-meta__value(datetime="#{event.updated_at.iso8601}") = l event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/home/_announcement.html.slim b/app/views/home/_announcement.html.slim index c6902a3035e..8c85c523f5f 100644 --- a/app/views/home/_announcement.html.slim +++ b/app/views/home/_announcement.html.slim @@ -17,5 +17,5 @@ // TODOエラー回避のためにつけたので不要になったら削除 - if announcement.published_at? .card-list-item-meta__item - time.a-meta(datetime="#{announcement.published_at.iso8601}" pubdate='pubdate') + time.a-meta(datetime="#{announcement.published_at.iso8601}") = l announcement.published_at diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index 97e6f750e63..ad710efbf70 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -20,7 +20,7 @@ = regular_event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{regular_event.updated_at.iso8601}" pubdate='pubdate') + time.a-meta__value(datetime="#{regular_event.updated_at.iso8601}") = l regular_event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/reports/_product.html.slim b/app/views/reports/_product.html.slim index 061a853b84f..9da25077a4e 100644 --- a/app/views/reports/_product.html.slim +++ b/app/views/reports/_product.html.slim @@ -35,7 +35,7 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: product.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{product.comments.last.updated_at.iso8601}" pubdate='pubdate') + time.a-meta(datetime="#{product.comments.last.updated_at.iso8601}") | 〜 #{l product.comments.last.updated_at, format: :date_and_time} - if product.checks.any? diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim index 33b8bb35b5c..f8aa13eeef9 100644 --- a/app/views/reports/_report.html.slim +++ b/app/views/reports/_report.html.slim @@ -52,7 +52,7 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: report.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{report.comments.last.updated_at.iso8601}" pubdate='pubdate') + time.a-meta(datetime="#{report.comments.last.updated_at.iso8601}") | 〜 #{l report.comments.last.updated_at, format: :date_and_time} - if report.checks.any? diff --git a/app/views/users/_product.html.slim b/app/views/users/_product.html.slim index e4d5b682886..62f0bcc7b01 100644 --- a/app/views/users/_product.html.slim +++ b/app/views/users/_product.html.slim @@ -1,7 +1,7 @@ .user-reports-item = link_to [product.practice, product], itemprop: 'url', class: 'user-reports-item__link' do h3.user-reports-item__title(itemprop='name') = product.title - time.user-reports-item__updated-at(datetime="#{product.updated_at.iso8601}" pubdate='pubdate') + time.user-reports-item__updated-at(datetime="#{product.updated_at.iso8601}") = l product.updated_at - if product.comments.any? .user-reports-item__comment-count diff --git a/app/views/users/_reports.html.slim b/app/views/users/_reports.html.slim index 20ab6818f1f..ecc96fe6512 100644 --- a/app/views/users/_reports.html.slim +++ b/app/views/users/_reports.html.slim @@ -4,7 +4,7 @@ .user-reports-item = link_to report, itemprop: 'url', class: 'user-reports-item__link' do h3.user-reports-item__title(itemprop='name') = report.title - time.user-reports-item__updated-at(datetime="#{report.updated_at.iso8601}" pubdate='pubdate') + time.user-reports-item__updated-at(datetime="#{report.updated_at.iso8601}") = l report.updated_at - if report.comments.any? .user-reports-item__comment-count diff --git a/app/views/users/comments/_comment.html.slim b/app/views/users/comments/_comment.html.slim index b2a62d9257a..f71a37d4833 100644 --- a/app/views/users/comments/_comment.html.slim +++ b/app/views/users/comments/_comment.html.slim @@ -29,7 +29,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{comment.updated_at.iso8601}" pubdate='pubdate') + time.a-meta(datetime="#{comment.updated_at.iso8601}") = l comment.updated_at .card-list-item__row .card-list-item__summary diff --git a/app/views/works/show.html.slim b/app/views/works/show.html.slim index 1702a7684e0..e01bc373bdd 100644 --- a/app/views/works/show.html.slim +++ b/app/views/works/show.html.slim @@ -41,7 +41,7 @@ hr.a-border .a-meta .a-meta__label | 登録日 - time.a-meta__value(datetime="#{@work.created_at.iso8601}" pubdate='pubdate') + time.a-meta__value(datetime="#{@work.created_at.iso8601}") = l @work.created_at .a-card From 1947d6408f2fce235cd23f7aea4f32002a2af42d Mon Sep 17 00:00:00 2001 From: shoma Date: Fri, 27 Mar 2026 13:17:58 +0900 Subject: [PATCH 08/13] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=A1=E3=83=AB?= =?UTF-8?q?=E3=82=B1=E3=83=BC=E3=82=B9=E3=82=92=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/products/product_component.html.slim | 2 +- app/views/notifications/_notification.html.slim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim index e311623cd06..bb13bc35f6a 100644 --- a/app/components/products/product_component.html.slim +++ b/app/components/products/product_component.html.slim @@ -81,7 +81,7 @@ .card-list-item-meta__items .card-list-item-meta__item - if @product.user.training_ends_on - time.a-meta dateTime=@product.user.training_ends_on.in_time_zone.iso8601 + time.a-meta datetime=@product.user.training_ends_on.in_time_zone.iso8601 span.a-meta__label | 研修終了日 span.a-meta__value diff --git a/app/views/notifications/_notification.html.slim b/app/views/notifications/_notification.html.slim index afc531d9b3b..0303e059519 100644 --- a/app/views/notifications/_notification.html.slim +++ b/app/views/notifications/_notification.html.slim @@ -26,5 +26,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta dateTime=notification.created_at.iso8601 + time.a-meta datetime=notification.created_at.iso8601 = l(notification.created_at, format: :long) From 1905a63f16fe8e54379e7e7f9d48123ae763348a Mon Sep 17 00:00:00 2001 From: shoma Date: Fri, 27 Mar 2026 14:51:08 +0900 Subject: [PATCH 09/13] =?UTF-8?q?datetime=E5=B1=9E=E6=80=A7=E3=81=8C?= =?UTF-8?q?=E7=84=A1=E3=81=8B=E3=81=A3=E3=81=9Ftime=E3=82=BF=E3=82=B0?= =?UTF-8?q?=E3=81=ABdatetime=E5=B1=9E=E6=80=A7=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CEOやアクセシビリティの観点から修正するべきと判断 --- .../products/product_component.html.slim | 14 ++++---- .../companies/products/_product.html.slim | 34 +++++++++++++------ app/views/events/_upcoming_event.html.slim | 2 +- .../_external_entry.html.slim | 2 +- app/views/home/_recent_report.html.slim | 2 +- app/views/questions/_question.html.slim | 4 +-- .../questions/_question_header.html.slim | 12 +++---- app/views/reports/_product.html.slim | 12 ++++--- app/views/reports/_report.html.slim | 8 +++-- app/views/users/_inactive_users.html.slim | 6 ++-- .../_wip_announcements.html.slim | 2 +- app/views/users/comments/_comment.html.slim | 2 +- app/views/users/events/_wip_events.html.slim | 2 +- app/views/users/events/index.html.slim | 2 +- app/views/users/pages/_wip_pages.html.slim | 2 +- .../users/products/_wip_products.html.slim | 2 +- .../users/reports/_wip_reports.html.slim | 2 +- app/views/watches/_watch.html.slim | 2 +- app/views/works/show.html.slim | 2 +- 19 files changed, 65 insertions(+), 49 deletions(-) diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim index bb13bc35f6a..2dd51a30313 100644 --- a/app/components/products/product_component.html.slim +++ b/app/components/products/product_component.html.slim @@ -33,26 +33,26 @@ | 提出物作成中 - elsif @product.published_at .card-list-item-meta__item - time.a-meta + time.a-meta datetime=@product.published_at.iso8601 span.a-meta__label | 提出 = l(@product.published_at) - else .card-list-item-meta__item - time.a-meta + time.a-meta datetime=@product.created_at.iso8601 span.a-meta__label | 提出 = l(@product.created_at) .card-list-item-meta__item - if @product.updated_at - time.a-meta + time.a-meta datetime=@product.updated_at.iso8601 span.a-meta__label | 更新 = l(@product.updated_at) - if @display_until_next_elapsed_days && elapsed_days < @reply_deadline_days - time.a-meta + .a-meta span.a-meta__label | 次の経過日数まで - if until_next_elapsed_days < 1 @@ -73,8 +73,10 @@ = link_to user, class: 'card-list-item__user-icons-icon' do = image_tag user.avatar_url, class: "a-user-icon #{role_class_for_user(user)}", title: user.icon_title, alt: user.icon_title .card-list-item-meta__item - time.a-meta - = "〜 #{l @product.comments.last.created_at, format: :date_and_time}" + .a-meta + | 〜 + time datetime=@product.comments.last.created_at.iso8601 + = l @product.comments.last.created_at, format: :date_and_time - if (@is_mentor || @is_admin) && @product.user.primary_role == 'trainee' .card-list-item__row diff --git a/app/views/companies/products/_product.html.slim b/app/views/companies/products/_product.html.slim index 5c2e80fd27c..056662090de 100644 --- a/app/views/companies/products/_product.html.slim +++ b/app/views/companies/products/_product.html.slim @@ -24,17 +24,17 @@ .a-meta 提出物作成中 - elsif product.published_at .card-list-item-meta__item - time.a-meta + time.a-meta datetime=product.published_at.iso8601 span.a-meta__label 提出 | #{l product.published_at} - else .card-list-item-meta__item - time.a-meta + time.a-meta datetime=product.created_at.iso8601 span.a-meta__label 提出 | #{l product.created_at} .card-list-item-meta__item - if product.updated_at - time.a-meta + time.a-meta datetime=product.updated_at.iso8601 span.a-meta__label 更新 | #{l product.updated_at} - if !product.comments.empty? @@ -58,23 +58,35 @@ - if product.self_last_commented_at && product.mentor_last_commented_at .card-list-item-meta__item - if product.self_last_commented_at > product.mentor_last_commented_at - time.a-meta - | 〜 #{l product.self_last_commented_at}（ + .a-meta + | 〜 + time.a-meta datetime=product.self_last_commented_at.iso8601 + = l product.self_last_commented_at + |（ strong 提出者 | ） - elsif product.self_last_commented_at < product.mentor_last_commented_at - time.a-meta - | 〜 #{l product.mentor_last_commented_at}（メンター） + .a-meta + | ～ + time.a-meta datetime=product.mentor_last_commented_at.iso8601 + = l product.mentor_last_commented_at + |（メンター） - elsif product.self_last_commented_at || product.mentor_last_commented_at .card-list-item-meta__item - if product.self_last_commented_at - time.a-meta - | 〜 #{l product.self_last_commented_at}（ + .a-meta + | 〜 + time.a-meta + = l product.self_last_commented_at + |（ strong 提出者 | ） - elsif product.mentor_last_commented_at - time.a-meta - | 〜 #{l product.mentor_last_commented_at}（メンター） + .a-meta + | ～ + time.a-meta + = l product.mentor_last_commented_at + |（メンター） - if current_user.mentor? && product.checks.empty? .card-list-item__row.is-only-mentor .card-list-item__assignee diff --git a/app/views/events/_upcoming_event.html.slim b/app/views/events/_upcoming_event.html.slim index d06bab47b44..b6fddf24494 100644 --- a/app/views/events/_upcoming_event.html.slim +++ b/app/views/events/_upcoming_event.html.slim @@ -26,7 +26,7 @@ .card-list-item-meta__items .card-list-item-meta__item - if event.held_on_scheduled_date? - time.a-meta + time.a-meta datetime=event.scheduled_date_with_start_time.iso8601 span.a-meta__label | 開催日時 span.a-meta__value diff --git a/app/views/external_entries/_external_entry.html.slim b/app/views/external_entries/_external_entry.html.slim index 83a7f637b47..3671d616cf6 100644 --- a/app/views/external_entries/_external_entry.html.slim +++ b/app/views/external_entries/_external_entry.html.slim @@ -15,7 +15,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta + time.a-meta datetime=external_entry.published_at.iso8601 = l(external_entry.published_at) .card-list-item__thumbnail = link_to external_entry.url, class: 'card-list-item__thumbnail-inner', target: '_blank', rel: 'noopener' do diff --git a/app/views/home/_recent_report.html.slim b/app/views/home/_recent_report.html.slim index 380ee2201d8..53f1c7ab33a 100644 --- a/app/views/home/_recent_report.html.slim +++ b/app/views/home/_recent_report.html.slim @@ -16,5 +16,5 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta + time.a-meta datetime=report.reported_on.in_time_zone.iso8601 = "#{l report.reported_on}の日報" diff --git a/app/views/questions/_question.html.slim b/app/views/questions/_question.html.slim index d7e9df49475..8141a5d7e5d 100644 --- a/app/views/questions/_question.html.slim +++ b/app/views/questions/_question.html.slim @@ -36,13 +36,13 @@ .card-list-item-meta__items - if !question.wip? .card-list-item-meta__item - time.a-meta + time.a-meta datetime=question.published_at.iso8601 span.a-meta__label | 公開 span.a-meta__value = l question.published_at, format: :default .card-list-item-meta__item - time.a-meta + time.a-meta datetime= question.updated_at.iso8601 span.a-meta__label | 更新 span.a-meta__value diff --git a/app/views/questions/_question_header.html.slim b/app/views/questions/_question_header.html.slim index fe46aa3656b..263462c02ec 100644 --- a/app/views/questions/_question_header.html.slim +++ b/app/views/questions/_question_header.html.slim @@ -42,19 +42,17 @@ header.page-content-header = link_to question.user.long_name, user_path(question.user), class: 'a-user-name' - if !question.wip? .page-content-header-metas__meta - time.a-meta + .a-meta span.a-meta__label | 公開 - span.a-meta__value - time(datetime="#{question.published_at.iso8601}") - | #{l question.published_at} + time.a-meta__value datetime=question.published_at.iso8601 + = l question.published_at .page-content-header-metas__meta .a-meta span.a-meta__label | 更新 - time.a-meta__value - time(datetime="#{question.updated_at.iso8601}") - | #{l question.updated_at} + time.a-meta__value datetime=question.updated_at.iso8601 + = l question.updated_at .page-content-header__row .page-content-header-actions diff --git a/app/views/reports/_product.html.slim b/app/views/reports/_product.html.slim index 9da25077a4e..d41e2526b07 100644 --- a/app/views/reports/_product.html.slim +++ b/app/views/reports/_product.html.slim @@ -18,11 +18,11 @@ .card-list-item-meta__items .card-list-item-meta__item - if product.published_at.nil? - time.a-meta(datetime="#{product.created_at.iso8601}") + time.a-meta datetime=product.created_at.iso8601 - else - time.a-meta(datetime="#{product.published_at.iso8601}") + time.a-meta datetime=product.published_at.iso8601 = l product.published_at - = 'の提出物' + | の提出物 - if product.comments.any? hr.card-list-item__row-separator .card-list-item__row @@ -35,8 +35,10 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: product.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{product.comments.last.updated_at.iso8601}") - | 〜 #{l product.comments.last.updated_at, format: :date_and_time} + .a-meta + | 〜 + time.a-meta datetime=product.comments.last.updated_at.iso8601 + = l product.comments.last.updated_at, format: :date_and_time - if product.checks.any? .stamp.stamp-approve diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim index f8aa13eeef9..c6757f8ae85 100644 --- a/app/views/reports/_report.html.slim +++ b/app/views/reports/_report.html.slim @@ -37,7 +37,7 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.in_time_zone.iso8601}") + time.a-meta datetime=report.reported_on.in_time_zone.iso8601 = l report.reported_on | の日報 - if report.comments.any? @@ -52,8 +52,10 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: report.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{report.comments.last.updated_at.iso8601}") - | 〜 #{l report.comments.last.updated_at, format: :date_and_time} + .a-meta + | 〜 + time.a-meta datetime=report.comments.last.updated_at.iso8601 + = l report.comments.last.updated_at, format: :date_and_time - if report.checks.any? .stamp.stamp-approve diff --git a/app/views/users/_inactive_users.html.slim b/app/views/users/_inactive_users.html.slim index 06cb62299ab..98ac38fe97b 100644 --- a/app/views/users/_inactive_users.html.slim +++ b/app/views/users/_inactive_users.html.slim @@ -18,11 +18,11 @@ | #{user.login_name} （#{user.name}） .card-list-item__row .card-list-item-meta - time.a-meta + .a-meta span.a-meta__label = User.human_attribute_name :last_activity_at - span.a-meta__value - - if user.last_activity_at? + - if user.last_activity_at? + time.a-meta__value datetime=user.last_activity_at.iso8601 = l user.last_activity_at hr.a-border-tint footer.card-footer diff --git a/app/views/users/announcements/_wip_announcements.html.slim b/app/views/users/announcements/_wip_announcements.html.slim index c257bed70d1..4de69fac908 100644 --- a/app/views/users/announcements/_wip_announcements.html.slim +++ b/app/views/users/announcements/_wip_announcements.html.slim @@ -14,5 +14,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{announcement.updated_at.iso8601}") + time.a-meta datetime=announcement.updated_at.iso8601 = l announcement.updated_at diff --git a/app/views/users/comments/_comment.html.slim b/app/views/users/comments/_comment.html.slim index f71a37d4833..ccf58b0d33a 100644 --- a/app/views/users/comments/_comment.html.slim +++ b/app/views/users/comments/_comment.html.slim @@ -29,7 +29,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{comment.updated_at.iso8601}") + time.a-meta datetime=comment.updated_at.iso8601 = l comment.updated_at .card-list-item__row .card-list-item__summary diff --git a/app/views/users/events/_wip_events.html.slim b/app/views/users/events/_wip_events.html.slim index 274a5519082..9378757a383 100644 --- a/app/views/users/events/_wip_events.html.slim +++ b/app/views/users/events/_wip_events.html.slim @@ -14,5 +14,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{event.updated_at.iso8601}") + time.a-meta datetime=event.updated_at.iso8601 = l event.updated_at diff --git a/app/views/users/events/index.html.slim b/app/views/users/events/index.html.slim index ba76c834494..b78ee8b2393 100644 --- a/app/views/users/events/index.html.slim +++ b/app/views/users/events/index.html.slim @@ -43,7 +43,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{event.start_at.iso8601}") + time.a-meta datetime=event.start_at.iso8601 | 開催日時:#{l event.start_at} .card-list-item-meta__item .a-meta diff --git a/app/views/users/pages/_wip_pages.html.slim b/app/views/users/pages/_wip_pages.html.slim index fd2fd472d65..02772337be6 100644 --- a/app/views/users/pages/_wip_pages.html.slim +++ b/app/views/users/pages/_wip_pages.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{page.updated_at.iso8601}") + time.a-meta datetime=page.updated_at.iso8601 = l page.updated_at diff --git a/app/views/users/products/_wip_products.html.slim b/app/views/users/products/_wip_products.html.slim index 5988ad817ef..6bcaed7f793 100644 --- a/app/views/users/products/_wip_products.html.slim +++ b/app/views/users/products/_wip_products.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at.iso8601}") + time.a-meta datetime=product.updated_at.iso8601 = l product.updated_at diff --git a/app/views/users/reports/_wip_reports.html.slim b/app/views/users/reports/_wip_reports.html.slim index 3b43ec7213b..e9a94a5ada9 100644 --- a/app/views/users/reports/_wip_reports.html.slim +++ b/app/views/users/reports/_wip_reports.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{report.updated_at.iso8601}") + time.a-meta datetime=report.updated_at.iso8601 = l report.updated_at diff --git a/app/views/watches/_watch.html.slim b/app/views/watches/_watch.html.slim index 3f38a83e7c5..7aa2c68c44f 100644 --- a/app/views/watches/_watch.html.slim +++ b/app/views/watches/_watch.html.slim @@ -38,7 +38,7 @@ = link_to watchable.user, class: 'a-user-name' do = watchable.user.login_name .card-list-item-meta__item - time.a-meta(datetime="#{watchable.created_at.iso8601}") + time.a-meta datetime=watchable.created_at.iso8601 = l watchable.created_at .card-list-item__option.hidden .a-watch-button.a-button.is-sm.is-block.is-main data-watch_id="#{watch.id}" diff --git a/app/views/works/show.html.slim b/app/views/works/show.html.slim index e01bc373bdd..4005e5c96b5 100644 --- a/app/views/works/show.html.slim +++ b/app/views/works/show.html.slim @@ -41,7 +41,7 @@ hr.a-border .a-meta .a-meta__label | 登録日 - time.a-meta__value(datetime="#{@work.created_at.iso8601}") + time.a-meta__value datetime=@work.created_at.iso8601 = l @work.created_at .a-card From da476096bd56b18f27bdcbb8489d31469f7694ee Mon Sep 17 00:00:00 2001 From: shoma Date: Fri, 27 Mar 2026 15:39:50 +0900 Subject: [PATCH 10/13] =?UTF-8?q?time=E3=82=BF=E3=82=B0=E4=BB=A5=E5=A4=96?= =?UTF-8?q?=E3=81=A7=E6=97=A5=E4=BB=98=E3=82=92=E6=89=B1=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E9=83=A8=E5=88=86=E3=82=92time=E3=82=BF?= =?UTF-8?q?=E3=82=B0=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/works/work_component.html.slim | 2 +- app/views/events/_upcoming_event.html.slim | 4 ++-- app/views/pair_works/_pair_work.html.slim | 4 ++-- app/views/questions/_nav_questions.html.slim | 4 +++- app/views/users/_metas.html.slim | 5 ++++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/components/works/work_component.html.slim b/app/components/works/work_component.html.slim index 9dfa40f3e32..5bd5a0caec4 100644 --- a/app/components/works/work_component.html.slim +++ b/app/components/works/work_component.html.slim @@ -20,5 +20,5 @@ = link_to work.user.name, user_path(work.user), class: 'a-user-name' .thumbnail-card__metas .thumbnail-card__meta - .thumbnail-card__date + time.thumbnail-card__date datetime=work.created_at.iso8601 = l(work.created_at) diff --git a/app/views/events/_upcoming_event.html.slim b/app/views/events/_upcoming_event.html.slim index b6fddf24494..7e3e2de0a60 100644 --- a/app/views/events/_upcoming_event.html.slim +++ b/app/views/events/_upcoming_event.html.slim @@ -26,10 +26,10 @@ .card-list-item-meta__items .card-list-item-meta__item - if event.held_on_scheduled_date? - time.a-meta datetime=event.scheduled_date_with_start_time.iso8601 + .a-meta span.a-meta__label | 開催日時 - span.a-meta__value + time.a-meta__value datetime=event.scheduled_date_with_start_time.iso8601 = I18n.localize(event.scheduled_date_with_start_time) - else .a-meta.is-important diff --git a/app/views/pair_works/_pair_work.html.slim b/app/views/pair_works/_pair_work.html.slim index efcb857aa6c..d019380dc03 100644 --- a/app/views/pair_works/_pair_work.html.slim +++ b/app/views/pair_works/_pair_work.html.slim @@ -35,10 +35,10 @@ span.a-meta__label | 投稿日時 - if pair_work.wip? - span.a-meta__value + time.a-meta__value datetime=pair_work.created_at.iso8601 = l pair_work.created_at - else - span.a-meta__value + time.a-meta__value datetime=pair_work.published_at.iso8601 = l pair_work.published_at .card-list-item-meta__item .a-meta(class="#{pair_work.important? ? 'is-important' : ''}") diff --git a/app/views/questions/_nav_questions.html.slim b/app/views/questions/_nav_questions.html.slim index 09c26a39134..4a8d941b62b 100644 --- a/app/views/questions/_nav_questions.html.slim +++ b/app/views/questions/_nav_questions.html.slim @@ -11,6 +11,8 @@ ul.a-side-nav__items = question.title .a-side-nav-metas .a-side-nav-metas__item - = "公開:#{l question.published_at}" + | 公開: + time datetime=question.published_at.iso8601 + = l question.published_at .a-side-nav-metas__item = "回答・コメント(#{question.answers.count})" diff --git a/app/views/users/_metas.html.slim b/app/views/users/_metas.html.slim index d66938b5fe4..4aa2eb6be3c 100644 --- a/app/views/users/_metas.html.slim +++ b/app/views/users/_metas.html.slim @@ -6,7 +6,10 @@ .user-metas__item-label = User.human_attribute_name :created_at .user-metas__item-value - | #{l user.created_at.to_date}（#{user.enrollment_period}） + time datetime=user.created_at.iso8601 + = l user.created_at.to_date + span + |（#{user.enrollment_period}） .user-metas__item .user-metas__item-label | お住まい From 492d8b1532fd2c44855c522616fbf1c223dd5acf Mon Sep 17 00:00:00 2001 From: shoma Date: Tue, 31 Mar 2026 14:08:22 +0900 Subject: [PATCH 11/13] =?UTF-8?q?=E5=86=97=E9=95=B7=E3=81=AA=E8=A8=98?= =?UTF-8?q?=E8=BF=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/announcements/_announcement.html.slim | 2 +- app/views/announcements/show.html.slim | 2 +- .../_coding_test_submission.html.slim | 2 +- .../coding_test_submissions/show.html.slim | 2 +- app/views/companies/products/_product.html.slim | 4 ++-- app/views/events/_event.html.slim | 2 +- app/views/events/_events.html.slim | 2 +- app/views/home/_announcement.html.slim | 2 +- .../home/_colleague_trainee_recent_report.html.slim | 2 +- app/views/products/_product.html.slim | 12 +++++++----- app/views/products/_product_header.html.slim | 6 +++--- app/views/products/_product_list_item.html.slim | 6 +++--- app/views/regular_events/_regular_event.html.slim | 2 +- app/views/regular_events/_regular_events.html.slim | 2 +- app/views/users/_product.html.slim | 2 +- app/views/users/questions/_wip_questions.html.slim | 2 +- 16 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/views/announcements/_announcement.html.slim b/app/views/announcements/_announcement.html.slim index 5eefce12859..59fb1122e7b 100644 --- a/app/views/announcements/_announcement.html.slim +++ b/app/views/announcements/_announcement.html.slim @@ -25,7 +25,7 @@ .a-meta | お知らせ作成中 - else - time.a-meta(datetime="#{announcement.published_at.iso8601}") + time.a-meta datetime=announcement.published_at.iso8601 span.a-meta__label | 公開 span.a-meta__value diff --git a/app/views/announcements/show.html.slim b/app/views/announcements/show.html.slim index 6e6e701b1cb..301abc7f6fb 100644 --- a/app/views/announcements/show.html.slim +++ b/app/views/announcements/show.html.slim @@ -30,7 +30,7 @@ hr.a-border .page-content-header__end .page-content-header__row .page-content-header__before-title - time.a-meta(datetime="#{@announcement.updated_at.iso8601}") + time.a-meta datetime=@announcement.updated_at.iso8601 = l @announcement.updated_at h1.page-content-header__title(class="#{@announcement.wip? ? 'is-wip' : ''}") - if @announcement.wip? diff --git a/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim b/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim index ffa1c98daba..40679bf7ac9 100644 --- a/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim +++ b/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim @@ -16,7 +16,7 @@ = link_to cts.user, class: 'a-user-name' do = cts.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{cts.updated_at.iso8601}") + time.a-meta datetime=cts.updated_at.iso8601 = l cts.updated_at .card-list-item__row .a-long-text diff --git a/app/views/coding_tests/coding_test_submissions/show.html.slim b/app/views/coding_tests/coding_test_submissions/show.html.slim index 964d5a390a7..e46a8501c0e 100644 --- a/app/views/coding_tests/coding_test_submissions/show.html.slim +++ b/app/views/coding_tests/coding_test_submissions/show.html.slim @@ -54,7 +54,7 @@ ruby: .page-content-header-metas__meta .a-meta .a-meta__label 提出日 - time.a-meta__value(datetime="#{cts.created_at.iso8601}") + time.a-meta__value datetime=cts.created_at.iso8601 = l cts.created_at .a-card diff --git a/app/views/companies/products/_product.html.slim b/app/views/companies/products/_product.html.slim index 056662090de..0914b5f9546 100644 --- a/app/views/companies/products/_product.html.slim +++ b/app/views/companies/products/_product.html.slim @@ -76,7 +76,7 @@ - if product.self_last_commented_at .a-meta | 〜 - time.a-meta + time.a-meta datetime=product.self_last_commented_at = l product.self_last_commented_at |（ strong 提出者 @@ -84,7 +84,7 @@ - elsif product.mentor_last_commented_at .a-meta | ～ - time.a-meta + time.a-meta datetime=product.mentor_last_commented_at = l product.mentor_last_commented_at |（メンター） - if current_user.mentor? && product.checks.empty? diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim index fd1be2a5f65..bc5fa385e6e 100644 --- a/app/views/events/_event.html.slim +++ b/app/views/events/_event.html.slim @@ -22,7 +22,7 @@ = event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{event.updated_at.iso8601}") + time.a-meta__value datetime=event.updated_at.iso8601 = l event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/events/_events.html.slim b/app/views/events/_events.html.slim index c1d1e211788..e6a10ffdc69 100644 --- a/app/views/events/_events.html.slim +++ b/app/views/events/_events.html.slim @@ -26,7 +26,7 @@ ul.card-list.a-card .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime=event.start_at.iso8601) + time.a-meta datetime=event.start_at.iso8601 span.a-meta__label 開催日時 span.a-meta__value = l event.start_at .card-list-item-meta__item diff --git a/app/views/home/_announcement.html.slim b/app/views/home/_announcement.html.slim index 8c85c523f5f..3ec3f9f4795 100644 --- a/app/views/home/_announcement.html.slim +++ b/app/views/home/_announcement.html.slim @@ -17,5 +17,5 @@ // TODOエラー回避のためにつけたので不要になったら削除 - if announcement.published_at? .card-list-item-meta__item - time.a-meta(datetime="#{announcement.published_at.iso8601}") + time.a-meta datetime=announcement.published_at.iso8601 = l announcement.published_at diff --git a/app/views/home/_colleague_trainee_recent_report.html.slim b/app/views/home/_colleague_trainee_recent_report.html.slim index 45ff04fc167..eaf7f1623ad 100644 --- a/app/views/home/_colleague_trainee_recent_report.html.slim +++ b/app/views/home/_colleague_trainee_recent_report.html.slim @@ -16,6 +16,6 @@ = link_to user_path(report.user), class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.in_time_zone.iso8601}") + time.a-meta datetime=report.reported_on.in_time_zone.iso8601 = l report.reported_on | の日報 diff --git a/app/views/products/_product.html.slim b/app/views/products/_product.html.slim index 2e855c6f8da..edccd33cc86 100644 --- a/app/views/products/_product.html.slim +++ b/app/views/products/_product.html.slim @@ -24,13 +24,13 @@ .a-meta | 提出物作成中 - elsif product.published_at.present? - time.a-meta(datetime="#{product.published_at.iso8601}") + time.a-meta datetime=product.published_at.iso8601 span.a-meta__label | 提出 span.a-meta__value = l product.published_at - else - time.a-meta(datetime="#{product.created_at.iso8601}") + time.a-meta datetime=product.created_at.iso8601 span.a-meta__label | 提出 span.a-meta__value @@ -38,7 +38,7 @@ - if product.updated_at.present? .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at.iso8601}") + time.a-meta datetime=product.updated_at.iso8601 span.a-meta__label | 更新 span.a-meta__value @@ -59,8 +59,10 @@ as: :user, cached: true .card-list-item-meta__item - time.a-meta(datetime="#{product.comments.last.created_at.iso8601}") - | 〜 #{l product.comments.last.created_at, format: :date_and_time} + .a-meta + | 〜 + time.a-meta datetime=product.comments.last.created_at.iso8601 + = l product.comments.last.created_at, format: :date_and_time - if !current_user.adviser? && product.practice.open_product? .card-list-item__row .card-list-item-meta diff --git a/app/views/products/_product_header.html.slim b/app/views/products/_product_header.html.slim index 5de836ef4a2..513dd931412 100644 --- a/app/views/products/_product_header.html.slim +++ b/app/views/products/_product_header.html.slim @@ -53,12 +53,12 @@ header.page-content-header.is-product - elsif product.published_at.present? span.a-meta__label | 提出 - time.a-meta__value(datetime="#{product.published_at.iso8601}") + time.a-meta__value datetime=product.published_at.iso8601 = l product.published_at - else span.a-meta__label | 提出 - time.a-meta__value(datetime="#{product.created_at.iso8601}") + time.a-meta__value datetime=product.created_at.iso8601 = l product.created_at - if product.updated_at.present? @@ -66,7 +66,7 @@ header.page-content-header.is-product .a-meta span.a-meta__label | 更新 - time.a-meta__value(datetime="#{product.updated_at.iso8601}") + time.a-meta__value datetime=product.updated_at.iso8601 = l product.updated_at .page-content-header-metas__end diff --git a/app/views/products/_product_list_item.html.slim b/app/views/products/_product_list_item.html.slim index 1a5a39965f2..f4400beb7ef 100644 --- a/app/views/products/_product_list_item.html.slim +++ b/app/views/products/_product_list_item.html.slim @@ -37,11 +37,11 @@ ruby: .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{product.created_at.to_datetime}") + time.a-meta datetime=product.created_at.to_datetime span.a-meta__label 提出 span.a-meta__value = l product.created_at .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at.to_datetime}") + time.a-meta datetime=product.updated_at.to_datetime span.a-meta__label 更新 span.a-meta__value = l product.updated_at - if (elapsed_days != product_deadline_day + 3 && is_unassigned_page) || is_dashboard_page @@ -67,7 +67,7 @@ ruby: .card-list-item-meta__items .card-list-item-meta__item - if product.user.training_ends_on.present? - time.a-meta(datetime="#{product.user.training_ends_on}") + time.a-meta datetime=product.user.training_ends_on span.a-meta__label 研修終了日 span.a-meta__value = l(product.user.training_ends_on) - remaining_days = (product.user.training_ends_on.to_date - Date.current).to_i diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index ad710efbf70..cd7166e6152 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -20,7 +20,7 @@ = regular_event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{regular_event.updated_at.iso8601}") + time.a-meta__value datetime=regular_event.updated_at.iso8601 = l regular_event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/regular_events/_regular_events.html.slim b/app/views/regular_events/_regular_events.html.slim index c539a13fc86..9d213631e36 100644 --- a/app/views/regular_events/_regular_events.html.slim +++ b/app/views/regular_events/_regular_events.html.slim @@ -44,7 +44,7 @@ ul.card-list.a-card image_class: 'card-list-item__user-icon a-user-icon' .card-list-item-meta__item - time.a-meta(datetime=event.start_at.iso8601) + time.a-meta datetime=event.start_at.iso8601 span.a-meta__label 開催日時 span.a-meta__value = "#{event.holding_cycles} #{l event.start_at, format: :time_only} ~ #{l event.end_at, format: :time_only}" .card-list-item-meta__item diff --git a/app/views/users/_product.html.slim b/app/views/users/_product.html.slim index 62f0bcc7b01..9c954d51cc3 100644 --- a/app/views/users/_product.html.slim +++ b/app/views/users/_product.html.slim @@ -1,7 +1,7 @@ .user-reports-item = link_to [product.practice, product], itemprop: 'url', class: 'user-reports-item__link' do h3.user-reports-item__title(itemprop='name') = product.title - time.user-reports-item__updated-at(datetime="#{product.updated_at.iso8601}") + time.user-reports-item__updated-at datetime=product.updated_at.iso8601 = l product.updated_at - if product.comments.any? .user-reports-item__comment-count diff --git a/app/views/users/questions/_wip_questions.html.slim b/app/views/users/questions/_wip_questions.html.slim index db29b67647c..3840e4345d2 100644 --- a/app/views/users/questions/_wip_questions.html.slim +++ b/app/views/users/questions/_wip_questions.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{question.updated_at.iso8601}") + time.a-meta datetime=question.updated_at.iso8601 = l question.updated_at From 46ae15189235e5648c4f2329ca777484acfa3ea5 Mon Sep 17 00:00:00 2001 From: shoma Date: Wed, 8 Apr 2026 13:07:12 +0900 Subject: [PATCH 12/13] =?UTF-8?q?time=E3=82=BF=E3=82=B0=E3=81=A7=E5=9B=B2?= =?UTF-8?q?=E3=82=80=E8=A6=81=E7=B4=A0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../products/product_component.html.slim | 15 +++++++++------ app/views/announcements/_announcement.html.slim | 4 ++-- app/views/home/_recent_report.html.slim | 6 ++++-- app/views/products/_product.html.slim | 12 ++++++------ app/views/products/_product_list_item.html.slim | 15 +++++++++------ .../regular_events/_regular_events.html.slim | 2 +- app/views/reports/_product.html.slim | 9 +++++---- app/views/reports/_report.html.slim | 5 +++-- 8 files changed, 39 insertions(+), 29 deletions(-) diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim index 2dd51a30313..bbacada61a7 100644 --- a/app/components/products/product_component.html.slim +++ b/app/components/products/product_component.html.slim @@ -33,23 +33,26 @@ | 提出物作成中 - elsif @product.published_at .card-list-item-meta__item - time.a-meta datetime=@product.published_at.iso8601 + .a-meta span.a-meta__label | 提出 - = l(@product.published_at) + time.a-meta__value datetime=@product.published_at.iso8601 + = l(@product.published_at) - else .card-list-item-meta__item - time.a-meta datetime=@product.created_at.iso8601 + .a-meta span.a-meta__label | 提出 - = l(@product.created_at) + time.a-meta datetime=@product.created_at.iso8601 + = l(@product.created_at) .card-list-item-meta__item - if @product.updated_at - time.a-meta datetime=@product.updated_at.iso8601 + .a-meta span.a-meta__label | 更新 - = l(@product.updated_at) + time.a-meta datetime=@product.updated_at.iso8601 + = l(@product.updated_at) - if @display_until_next_elapsed_days && elapsed_days < @reply_deadline_days .a-meta diff --git a/app/views/announcements/_announcement.html.slim b/app/views/announcements/_announcement.html.slim index 59fb1122e7b..417b5595707 100644 --- a/app/views/announcements/_announcement.html.slim +++ b/app/views/announcements/_announcement.html.slim @@ -25,10 +25,10 @@ .a-meta | お知らせ作成中 - else - time.a-meta datetime=announcement.published_at.iso8601 + .a-meta span.a-meta__label | 公開 - span.a-meta__value + time.a-meta__value datetime=announcement.published_at.iso8601 | #{l announcement.published_at} .card-list-item-meta__item .a-meta diff --git a/app/views/home/_recent_report.html.slim b/app/views/home/_recent_report.html.slim index 53f1c7ab33a..951edb36c4a 100644 --- a/app/views/home/_recent_report.html.slim +++ b/app/views/home/_recent_report.html.slim @@ -16,5 +16,7 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta datetime=report.reported_on.in_time_zone.iso8601 - = "#{l report.reported_on}の日報" + .a-meta + time.a-meta__value datetime=report.reported_on.in_time_zone.iso8601 + = l report.reported_on + | の日報 diff --git a/app/views/products/_product.html.slim b/app/views/products/_product.html.slim index edccd33cc86..78da650c7ce 100644 --- a/app/views/products/_product.html.slim +++ b/app/views/products/_product.html.slim @@ -24,24 +24,24 @@ .a-meta | 提出物作成中 - elsif product.published_at.present? - time.a-meta datetime=product.published_at.iso8601 + .a-meta span.a-meta__label | 提出 - span.a-meta__value + time.a-meta__value datetime=product.published_at.iso8601 = l product.published_at - else - time.a-meta datetime=product.created_at.iso8601 + .a-meta span.a-meta__label | 提出 - span.a-meta__value + time.a-meta__value datetime=product.created_at.iso8601 = l product.created_at - if product.updated_at.present? .card-list-item-meta__item - time.a-meta datetime=product.updated_at.iso8601 + .a-meta span.a-meta__label | 更新 - span.a-meta__value + time.a-meta__value datetime=product.updated_at.iso8601 = l product.updated_at - if product.comments.any? hr.card-list-item__row-separator diff --git a/app/views/products/_product_list_item.html.slim b/app/views/products/_product_list_item.html.slim index f4400beb7ef..2891c16277d 100644 --- a/app/views/products/_product_list_item.html.slim +++ b/app/views/products/_product_list_item.html.slim @@ -37,13 +37,15 @@ ruby: .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta datetime=product.created_at.to_datetime + .a-meta span.a-meta__label 提出 - span.a-meta__value = l product.created_at + time.a-meta__value datetime=product.created_at.iso8601 + = l product.created_at .card-list-item-meta__item - time.a-meta datetime=product.updated_at.to_datetime + .a-meta datetime="" span.a-meta__label 更新 - span.a-meta__value = l product.updated_at + time.a-meta__value datetime=product.updated_at.iso8601 + = l product.updated_at - if (elapsed_days != product_deadline_day + 3 && is_unassigned_page) || is_dashboard_page .card-list-item-meta__item .a-meta @@ -67,9 +69,10 @@ ruby: .card-list-item-meta__items .card-list-item-meta__item - if product.user.training_ends_on.present? - time.a-meta datetime=product.user.training_ends_on + .a-meta span.a-meta__label 研修終了日 - span.a-meta__value = l(product.user.training_ends_on) + time.a-meta__value datetime=product.user.training_ends_on.iso8601 + = l(product.user.training_ends_on) - remaining_days = (product.user.training_ends_on.to_date - Date.current).to_i - if remaining_days.zero? span.a-meta__value.is-danger （本日研修最終日） diff --git a/app/views/regular_events/_regular_events.html.slim b/app/views/regular_events/_regular_events.html.slim index 9d213631e36..40c84d2590f 100644 --- a/app/views/regular_events/_regular_events.html.slim +++ b/app/views/regular_events/_regular_events.html.slim @@ -44,7 +44,7 @@ ul.card-list.a-card image_class: 'card-list-item__user-icon a-user-icon' .card-list-item-meta__item - time.a-meta datetime=event.start_at.iso8601 + .a-meta span.a-meta__label 開催日時 span.a-meta__value = "#{event.holding_cycles} #{l event.start_at, format: :time_only} ~ #{l event.end_at, format: :time_only}" .card-list-item-meta__item diff --git a/app/views/reports/_product.html.slim b/app/views/reports/_product.html.slim index d41e2526b07..e9a0b990f81 100644 --- a/app/views/reports/_product.html.slim +++ b/app/views/reports/_product.html.slim @@ -18,11 +18,12 @@ .card-list-item-meta__items .card-list-item-meta__item - if product.published_at.nil? - time.a-meta datetime=product.created_at.iso8601 + time.a-meta datetime=product.created_at.iso8601 - else - time.a-meta datetime=product.published_at.iso8601 - = l product.published_at - | の提出物 + .a-meta + time.a-meta__value datetime=product.published_at.iso8601 + = l product.published_at + | の提出物 - if product.comments.any? hr.card-list-item__row-separator .card-list-item__row diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim index c6757f8ae85..4f123ac3401 100644 --- a/app/views/reports/_report.html.slim +++ b/app/views/reports/_report.html.slim @@ -37,8 +37,9 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta datetime=report.reported_on.in_time_zone.iso8601 - = l report.reported_on + .a-meta + time.a-meta__value datetime=report.reported_on.in_time_zone.iso8601 + = l report.reported_on | の日報 - if report.comments.any? hr.card-list-item__row-separator From 12c42599ba74a2c16706aa20750cf80961b4d7f0 Mon Sep 17 00:00:00 2001 From: shoma Date: Thu, 9 Apr 2026 18:52:19 +0900 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=83=91=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A3=E3=83=AB=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/fjordllc/bootcamp/pull/431 にて ユーザー詳細ページに提出物一覧を表示する機能を作成した際に作られたパーシャルファイル しかし、https://github.com/fjordllc/bootcamp/pull/447 にて 表示をタブ表示に変更した際に使用されなくなった。この際の消し忘れだと判断 以下で確認してもパーシャルファイルを使用している部分が見当たらなかったので削除した - git grep "render 'users/product'" - git grep users/product --- app/views/users/_product.html.slim | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 app/views/users/_product.html.slim diff --git a/app/views/users/_product.html.slim b/app/views/users/_product.html.slim deleted file mode 100644 index 9c954d51cc3..00000000000 --- a/app/views/users/_product.html.slim +++ /dev/null @@ -1,11 +0,0 @@ -.user-reports-item - = link_to [product.practice, product], itemprop: 'url', class: 'user-reports-item__link' do - h3.user-reports-item__title(itemprop='name') = product.title - time.user-reports-item__updated-at datetime=product.updated_at.iso8601 - = l product.updated_at - - if product.comments.any? - .user-reports-item__comment-count - .user-reports-item__comment-count-label - i.fa-solid.fa-comment - .user-reports-item__comment-count-value - = product.comments.count