Skip to Content

Changes for page 学校ページテンプレート

Last modified by Super Admin on 2026/04/05 18:59

From 111.1 to 110.1 From 118.1 to 117.1

From version

edited by Super Admin
on 2026/04/01 16:28

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/24 21:32

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

@@ -387,7 +387,7 @@
  #end
  #if($canEditSchool)
  <div style="text-align:right; margin-bottom:12px;">
--  <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 情報を編集</a>
++  <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報を編集</a>
  </div>
  #end
@@ -409,6 +409,106 @@
  </div>
  #end
++## --- 入力進捗ガイド（自校ユーザー向け） ---
++#if(!$isGuest && $canEdit)
++  #set($stepItems = [])
++  #set($completedCount = 0)
++  #set($totalSteps = 8)
++  ## 1. 基本情報（生徒数）
++  #if($studentCount && $studentCount != '' && $studentCount != '0')
++    #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false}))
++  #end
++  ## 2. 生徒会組織
++  #if($orgChart && $orgChart != '')
++    #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
++  #end
++  ## 3. 日常の活動
++  #if($dailyActivities && $dailyActivities != '')
++    #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
++  #end
++  ## 4. 生徒総会
++  #if($assemblyFormat && $assemblyFormat != '')
++    #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
++  #end
++  ## 5. 選挙
++  #if($electionExists && $electionExists != '')
++    #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
++  #end
++  ## 6. 校則の見直し
++  #if($ruleReviewStatus && $ruleReviewStatus != '')
++    #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
++  #end
++  ## 7. 予算
++  #set($budgetFilled = false)
++  #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
++  #if($budgetFilled)
++    #set($discard = $stepItems.add({'name': '予算', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '予算', 'done': false}))
++  #end
++  ## 8. 活動報告
++  #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
++  #if($activityCount > 0)
++    #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false}))
++  #end
++  ## 全完了なら非表示
++  #if($completedCount < $totalSteps)
++    #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
++    #set($progressPctInt = $mathtool.toInteger($progressPct))
++    #set($firstMissing = false)
++<div class="progress-guide" style="margin-bottom:var(--sp-4);">
++  <div class="progress-guide-header">
++    <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span>
++    <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
++  </div>
++  <div class="progress-bar-track">
++    <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
++  </div>
++  <ul class="progress-step-list">
++    #foreach($step in $stepItems)
++      #if($step.done)
++    <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li>
++      #else
++        #if(!$firstMissing)
++    <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ！</span></li>
++          #set($firstMissing = true)
++        #else
++    <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li>
++        #end
++      #end
++    #end
++  </ul>
++  <div style="margin-top:var(--sp-3);">
++    <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
++      <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集画面を開く
++    </a>
++  </div>
++</div>
++  #end
++#end
++
  ## --- ① 学校基本情報 ---
  <div class="school-info-card collapsed" id="card-basic-info">
    <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
@@ -1004,13 +1004,13 @@
  <div class="activity-toolbar">
    <div class="activity-fy-tabs">
--    <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
++    <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
      #foreach($fy in $fySet)
        #if($fy != $currentFYStr)
      <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
        #end
      #end
--    <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
++    <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
    </div>
    <div class="activity-toolbar-right">
      <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
@@ -1049,64 +1049,22 @@
  {{/html}}
--## 活動を「年度降順 + 特色あり先頭」で並び替え
--## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
--#set($fyNums = [])
--#foreach($fy in $fySet)
--  #if($fy && $fy != '' && $fy != 'unknown')
--    #set($discard = $fyNums.add($fy))
--  #end
--#end
--## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
--#set($fyDesc = [])
--#set($fyRemaining = [])
--#foreach($fy in $fyNums)
--  #set($discard = $fyRemaining.add($fy))
--#end
--#foreach($dummy in [1..20])
--  #if($fyRemaining.isEmpty())#break#end
--  #set($fyMax = $fyRemaining.get(0))
--  #foreach($fy in $fyRemaining)
--    #if($fy > $fyMax)#set($fyMax = $fy)#end
--  #end
--  #set($discard = $fyDesc.add($fyMax))
--  #set($fyNextRem = [])
--  #set($fyMaxRemoved = false)
--  #foreach($fy in $fyRemaining)
--    #if(!$fyMaxRemoved && $fy == $fyMax)
--      #set($fyMaxRemoved = true)
++## 特色ある活動を先頭に表示するため、並び替え用リストを作成
++#set($featuredActivities = [])
++#set($normalActivities = [])
++#if($activities && $activities.size() > 0)
++  #foreach($act in $activities)
++    #set($isFeatured = $!act.getValue('featured'))
++    #if($isFeatured == '1')
++      #set($discard = $featuredActivities.add($foreach.index))
      #else
--      #set($discard = $fyNextRem.add($fy))
++      #set($discard = $normalActivities.add($foreach.index))
      #end
    #end
--  #set($fyRemaining = $fyNextRem)
  #end
--## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
--#set($discard = $fyDesc.add('unknown'))
--## Step2: 年度降順で featured → normal の順にインデックスを収集
  #set($orderedActivityIndices = [])
--#foreach($curFY in $fyDesc)
--  ## 同年度の特色あり活動を先頭に
--  #set($actIdx2 = 0)
--  #foreach($act in $activities)
--    #set($aFY2 = $!act.getValue('fiscalYear'))
--    #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
--    #if($aFY2 == $curFY && $act.getValue('featured') == '1')
--      #set($discard = $orderedActivityIndices.add($actIdx2))
--    #end
--    #set($actIdx2 = $actIdx2 + 1)
--  #end
--  ## 同年度の通常活動
--  #set($actIdx2 = 0)
--  #foreach($act in $activities)
--    #set($aFY2 = $!act.getValue('fiscalYear'))
--    #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
--    #if($aFY2 == $curFY && $act.getValue('featured') != '1')
--      #set($discard = $orderedActivityIndices.add($actIdx2))
--    #end
--    #set($actIdx2 = $actIdx2 + 1)
--  #end
--#end
++#set($discard = $orderedActivityIndices.addAll($featuredActivities))
++#set($discard = $orderedActivityIndices.addAll($normalActivities))
  #if($activities && $activities.size() > 0)
    #foreach($actIdx in $orderedActivityIndices)
@@ -1615,7 +1615,7 @@
  }
  // ページ読み込み時の初期化
  document.addEventListener('DOMContentLoaded', function() {
--  // 年度タブを降順にソート（「全期間」タブは先頭に固定）
++  // 年度タブを降順にソート（「全期間」タブは末尾に固定）
    var tabContainer = document.querySelector('.activity-fy-tabs');
    if (tabContainer) {
      var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
@@ -1632,11 +1632,11 @@
        var bYear = parseInt(b.textContent) || 0;
        return bYear - aYear;
      });
--    // DOM再配置（全期間を先頭、年度タブを降順で続ける）
--    if (allTab) { tabContainer.appendChild(allTab); }
++    // DOM再配置
      fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
++    if (allTab) { tabContainer.appendChild(allTab); }
    }
--  // デフォルトで全期間を表示
++  // デフォルトで現在の年度を表示
    var defaultTab = document.querySelector('.activity-fy-tab.active');
    if (defaultTab) { defaultTab.click(); }
    // 保存成功時のトースト通知