管理者が自分以外のユーザーアイコンを変更できないバグを修正

app/components/skipped_practice_component.html.slim

@@ -0,0 +1,20 @@
+- @user_course_practice.categories_for_skip_practice.each do |category|
+  .skip-practices
+    input.a-toggle-checkbox(type='checkbox' id="category-#{category}")
+    .skip-practices__inner
+      label.skip-practices__header(for='category-#{category}')
+        .skip-practices__start
+          .skip-practices__category-name
+            | #{category.name}
+          .skip-practices__count
+            | #{skipped_practices_count(category)}
+        .skip-practices__end
+          .skip-practices__category-angle-icon
+            i.fa-regular.fa-angle-down
+      .skip-practices__body
+        = @f.collection_check_boxes :practice_ids, category.practices , :id, :title, include_hidden: false, class: 'label-checkbox' do |b|
+          .checkboxes
+            .checkboxes__items
+              .checkboxes__item.is-sm
+                = b.check_box(class: 'a-toggle-checkbox')
+                = b.label { b.text }

app/components/skipped_practice_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class SkippedPracticeComponent < ViewComponent::Base
+  def initialize(form:, user:)
+    @f = form
+    @user = user
+    @user_course_practice = UserCoursePractice.new(user)
+    @uniq_practice_ids = @user_course_practice.uniq_practice_ids
+  end
+
+  def skipped_practices_count(category)
+    if category.practices.empty?
+      '(0)'
+    else
+      skipped_practices_in_category = category.practice_ids & @user_course_practice.skipped_practice_ids
+      "(#{skipped_practices_in_category.size}/#{category.practices.size})"
+    end
+  end
+end

app/controllers/admin/corporate_training_inquiries_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Admin::CorporateTrainingInquiriesController < AdminController
+  PAGER_NUMBER = 20
+  def index
+    per = params[:per] || PAGER_NUMBER
+    @corporate_training_inquiries = CorporateTrainingInquiry.order(created_at: :desc).page(params[:page]).per(per)
+  end
+
+  def show
+    @corporate_training_inquiry = CorporateTrainingInquiry.find(params[:id])
+  end
+end

app/controllers/admin/users_controller.rb

@@ -62,14 +62,14 @@ def user_params
       :password, :password_confirmation, :job,
       :organization, :os, :study_place,
       { experiences: [] }, :company_id,
-      :trainee, :job_seeking, :nda,
+      :trainee, :job_seeking, :nda, :avatar,
       :graduated_on, :retired_on,
       :job_seeker, :github_collaborator,
       :officekey_permission, :tag_list, :training_ends_on,
       :auto_retire, :invoice_payment, :hide_mentor_profile,
       :profile_image, :profile_name, :profile_job, :mentor,
       :profile_text, { authored_books_attributes: %i[id title url cover _destroy] },
-      :country_code, :subdivision_code, discord_profile_attributes: %i[account_name times_url times_id]
+      :country_code, :subdivision_code, discord_profile_attributes: %i[account_name times_url times_id], practice_ids: []
     )
   end
 

app/controllers/api/courses/practices_controller.rb

@@ -11,6 +11,6 @@ def index
                   .includes(practices: [{ started_students: { avatar_attachment: :blob } }, :learning_minute_statistic, :practices_books])
                   .order('courses_categories.position')
     @learnings = current_user.learnings
-    @completed_practices_size_by_category = current_user.completed_practices_size_by_category
+    @completed_practices_size_by_category = @current_user_practice.completed_practices_size_by_category
   end
 end

app/controllers/application_controller.rb

@@ -13,6 +13,7 @@ class ApplicationController < ActionController::Base
   before_action :allow_cross_domain_access
   before_action :set_host_for_disk_storage
   before_action :require_active_user_login
+  before_action :set_current_user_practice
 
   protected
 
@@ -55,6 +56,10 @@ def require_scheduler_inheritation
     head :internal_server_error unless is_a?(SchedulerController)
   end
 
+  def set_current_user_practice
+    @current_user_practice = UserCoursePractice.new(current_user)
+  end
+
   protected
 
   def staging?

app/controllers/courses/practices_controller.rb

@@ -5,5 +5,6 @@ def index
     @course = Course.find(params[:course_id])
     @categories = @course.categories.includes(practices: %i[practices_books learning_minute_statistic started_students]).order(:created_at)
     @learnings = current_user.learnings
+    @completed_practices_size_by_category = @current_user_practice.completed_practices_size_by_category
   end
 end

app/decorators/user_course_practice_decorator.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module UserCoursePracticeDecorator
+  def cached_completed_percentage
+    Rails.cache.fetch "/model/user_course_practice/#{user.id}/completed_percentage" do
+      completed_percentage
+    end
+  end
+
+  def cached_completed_fraction
+    Rails.cache.fetch "/model/user_course_practice/#{user.id}/completed_fraction" do
+      "修了: #{completed_practices.size} （必須: #{completed_required_practices.size}/#{required_practices.size}）"
+    end
+  end
+
+  def cached_completed_fraction_in_metas
+    Rails.cache.fetch "/model/user_course_practice/#{user.id}/completed_fraction_in_metas" do
+      "#{completed_practices.size} （必須:#{completed_required_practices.size}）"
+    end
+  end
+end

app/decorators/user_decorator.rb

@@ -22,20 +22,6 @@ def icon_classes(*classes)
     classes.join(' ')
   end
 
-  def cached_completed_percentage
-    Rails.cache.fetch "/model/user/#{id}/completed_percentage" do
-      completed_percentage
-    end
-  end
-
-  def completed_fraction
-    "修了: #{completed_practices.size} （必須: #{completed_practices_include_progress_size}/#{practices_include_progress.pluck(:id).uniq.size}）"
-  end
-
-  def completed_fraction_in_metas
-    "#{completed_practices.size} （必須:#{completed_practices_include_progress_size}）"
-  end
-
   def customer_url
     "https://dashboard.stripe.com/customers/#{customer_id}"
   end

app/javascript/components/Reports.jsx

@@ -57,7 +57,7 @@ export default function Reports({
   }
 
   return (
-    <div className="page-main">
+    <div className="page-main is-react">
       {data.totalPages === 0 && (
         <div>
           {practices && (

app/javascript/components/UserPracticeProgress.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 
 export default function UserPracticeProgress({ user }) {
   const percentage = user.cached_completed_percentage
-  const fraction = user.completed_fraction
+  const fraction = user.cached_completed_fraction
 
   const roundedPercentage = user.graduated_on
     ? '100%'

app/javascript/components/user-practice-progress.vue

@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       percentage: this.user.cached_completed_percentage,
-      fraction: this.user.completed_fraction
+      fraction: this.user.cached_completed_fraction
     }
   },
   computed: {

app/javascript/stylesheets/application.sass

@@ -10,6 +10,7 @@
 @import application/blocks/auth-form/auth-form-nav
 @import application/blocks/auth-form/auth-form
 @import application/blocks/auth-form/next-settlement-time
+@import application/blocks/auth-form/skip-practices
 
 @import application/blocks/cards/card-counts
 

app/javascript/stylesheets/application/blocks/auth-form/_skip-practices.sass

@@ -0,0 +1,53 @@
+.skip-practices
+  .skip-practices + &
+    margin-top: .5rem
+
+.skip-practices__inner
+  border-radius: .25rem
+  border: solid 1px var(--border)
+  overflow: hidden
+  transition: all .2s ease-out
+  input:checked + &
+    border-color: var(--primary)
+
+.skip-practices__header
+  display: flex
+  justify-content: space-between
+  height: 2.5rem
+  +text-block(.875rem 1.5)
+  padding: .75rem
+  align-items: center
+  cursor: pointer
+  color: var(--semi-muted-text)
+  transition: all .2s ease-out
+  &:hover
+    background-color: var(--background)
+  input:checked + .skip-practices__inner &
+    background-color: var(--primary-tint)
+    color: var(--primary-text)
+
+.skip-practices__category-angle-icon
+  transition: all .2s ease-out
+  input:checked + .skip-practices__inner &
+    transform: rotate(180deg)
+
+.skip-practices__category-name
+  transition: all .2s ease-out
+  .skip-practices__header:hover &
+    text-decoration: underline
+    color: var(--default-text)
+
+.skip-practices__start
+  display: flex
+  gap: .25rem
+
+.skip-practices__body
+  transition: all .2s ease-out
+  display: none
+  border-top: solid 1px var(--primary-semi-tint)
+  margin-top: -1px
+  padding: .75rem
+  font-size: .8125rem
+  background-color: var(--primary-tint)
+  input:checked + .skip-practices__inner &
+    display: block

app/javascript/stylesheets/application/blocks/page-content/_page-content-header.sass

@@ -106,6 +106,8 @@
     word-break: break-all
   &.is-wip
     color: var(--muted-text)
+  &.is-skip-on
+    color: var(--muted-text)
   .a-title-label
     display: inline-flex
     vertical-align: top
@@ -168,3 +170,12 @@
   +media-breakpoint-down(sm)
     +size(3.5rem)
     +position(absolute, right 0, top 0)
+
+.page-content-header__alert
+  background-color: var(--danger-tint)
+  color: var(--danger-text)
+  +text-block(.875rem 1.4)
+  text-align: center
+  padding: .5rem 1rem
+  border: solid 1px var(--danger)
+  border-radius: .25rem

app/javascript/stylesheets/application/blocks/practice/_category-practices-item.sass

@@ -10,6 +10,8 @@
     padding: .5rem .75rem .75rem
   &.sortable-chosen
     background-color: tint($warning, 90%)
+  &.is-skip-on
+    background-color: var(--background-tint)
   &[draggable="false"]
     background-color: var(--base)
     animation: grab-background-color 1.25s ease 0s 1 normal none running
@@ -52,6 +54,8 @@
     font-size: .8125rem
   .a-badge
     margin-right: .25rem
+  &.is-skip-on
+    color: var(--muted-text)
 
 .category-practices-item__title-link-label
   a.category-practices-item__title-link:hover &

app/javascript/stylesheets/application/blocks/side/_side-tabs-contents.sass

@@ -17,65 +17,26 @@
   display: none
   .a-card
     border-top-left-radius: 0
-  .user-info + .a-card
-    border-top-right-radius: 0
+    max-height: 76vh
+    overflow-y: auto
   .card-header
     display: none
   .card-header + [class*=a-border]
     display: none
   .card-body
     max-height: calc(100vh - 181px)
     overflow-y: auto
-  .user-info + .a-card .card-body
-    max-height: calc(100vh - 330px)
-  .user-info
-    padding: 1rem
-    background-color: var(--base)
-    border: solid 1px var(--border)
-    border-bottom: none
-    max-height: 13rem
-    overflow: auto
   .user-metas
     margin-top: 0
-    & + .user-metas
-      margin-top: -1px
   .user-metas__title
     padding: .25rem .5rem
-    font-size: .625rem
-    background-color: var(--background)
-  .user-metas__items
-    padding: .25rem .5rem
+    font-size: .75rem
   .user-metas__item
-    display: inline
     +text-block(.75rem 1.6)
-    padding: 0
-    border: none
-    &:not(:last-child)::after
-      content: '、'
-  .user-metas__item:not(:last-child)
-    border: none
-  .user-metas__item:nth-child(even)
-    background-color: var(--base)
-  .user-metas__item-label,
-  .user-metas__item-value
-    padding: 0
-    display: inline
-    +media-breakpoint-down(sm)
-      border: none
-    ul,
-    li
-      margin-left: 0
-      display: inline
-    li:not(:last-child)::after
-      content: '・'
+    border: solid 1px var(--border)
+    margin: -1px
   .user-metas__item-label
-    border-right: none
-    flex: 0 0 auto
-    &::after
-      content: ':'
-      margin-inline: .125rem
-  .form-tabs
-    margin-bottom: 0
+    flex: 0 0 9rem
   .a-markdown-input
     padding-inline: 0
   .a-long-text

app/javascript/stylesheets/atoms/_a-card.sass

@@ -34,7 +34,7 @@
       margin-inline: 1rem
   &.is-toggle
     label
-        cursor: pointer
+      cursor: pointer
     > input:not(:checked) + * + *
       display: none
     > input:not(:checked) + *
@@ -45,6 +45,10 @@
       display: none
     > input:checked + * .is-hidden-then-checked
       display: none
+    .card-body
+      max-height: 50vh
+      overflow-y: auto
+
 
 table.a-card
   display: table

app/javascript/stylesheets/config/mixins/_practice-color.sass

@@ -21,6 +21,14 @@
     +practice-button($success, $border)
     color: var(--reversal-text)
   &.is-unstarted
+    +practice-button(#fff)
+    color: var(--muted-text)
+    border: solid 1px var(--border)
+    &.is-active
+      color: var(--default-text)
+      border-color: var(--defaut-text)
+      background-color: var(--background-tint)
+  &.is-skip-on
     +practice-button(#dcdcdc, $border)
     color: var(--muted-text)
   @if $border == true