Skip to Content

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

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

From 42.1 to 41.1 From 45.1 to 44.1

From version

edited by Super Admin
on 2026/03/13 00:18

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/12 12:20

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -65,7 +65,9 @@
  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
--## --- 現在の年度を計算（4月始まり） ---
++## --- 年度アーカイブ ---
++#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
++## 現在の年度を計算（4月始まり）
  #set($nowFY = $datetool.date)
  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
@@ -74,6 +74,10 @@
  #else
    #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
  #end
++## fiscalYear 未設定時はデフォルトとして現在の年度を使う
++#if(!$pageFiscalYear || $pageFiscalYear == '')
++  #set($pageFiscalYear = $currentFiscalYear.toString())
++#end
  ## --- 公開範囲フィールド ---
  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
@@ -247,7 +247,7 @@
        <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
        <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
        <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
--      <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
++      <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
        <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
      </table>
      #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
@@ -305,7 +305,7 @@
  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
  <div class="school-section-grid">
--  #if($dailyActivities && !$dailyActivities.isEmpty())
++  #if($dailyActivities && $dailyActivities != '')
    <div class="school-section-card">
      <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
      <div class="card-inner">
@@ -312,7 +312,7 @@
        <p class="activity-hint">活動時間の多い順に上位3つ</p>
        <div class="tag-container">
          #set($daIdx = 1)
--        #foreach($da in $dailyActivities)
++        #foreach($da in $dailyActivities.split(","))
            <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
            #set($daIdx = $daIdx + 1)
          #end
@@ -363,7 +363,7 @@
    #end
    ## --- ⑦ 予算 ---
--  #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
++  #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
    #if($hasBudget)
      ## 公開範囲チェック
      #set($canViewBudget = true)
@@ -374,12 +374,12 @@
    <div class="school-section-card">
      <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
      <div class="card-inner">
--      #if($budgetProcess && !$budgetProcess.isEmpty())
++      #if($budgetProcess && $budgetProcess != '')
        <div class="info-row">
          <span class="info-label">作成過程の生徒関与</span>
          <span class="info-value">
            <div class="selection-display">
--            #foreach($bp in $budgetProcess)
++            #foreach($bp in $budgetProcess.split(","))
                <span class="selection-item">$!escapetool.xml($bp.trim())</span>
              #end
            </div>
@@ -398,12 +398,12 @@
          <span class="info-value">$!escapetool.xml($!budgetScale)</span>
        </div>
        #end
--      #if($budgetAllocation && !$budgetAllocation.isEmpty())
++      #if($budgetAllocation && $budgetAllocation != '')
        <div class="info-row">
          <span class="info-label">主な予算配分</span>
          <span class="info-value">
            <div class="selection-display">
--            #foreach($ba in $budgetAllocation)
++            #foreach($ba in $budgetAllocation.split(","))
                <span class="selection-item">$!escapetool.xml($ba.trim())</span>
              #end
            </div>
@@ -436,12 +436,12 @@
        <span class="info-label">見直しの有無（3年以内）</span>
        <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
      </div>
--    #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
++    #if($ruleReviewContent && $ruleReviewContent != '')
      <div class="info-row">
        <span class="info-label">見直しの内容</span>
        <span class="info-value">
          <div class="selection-display">
--          #foreach($rc in $ruleReviewContent)
++          #foreach($rc in $ruleReviewContent.split(","))
              <span class="selection-item">$!escapetool.xml($rc.trim())</span>
            #end
          </div>
@@ -448,12 +448,12 @@
        </span>
      </div>
      #end
--    #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
++    #if($ruleReviewProposer && $ruleReviewProposer != '')
      <div class="info-row">
        <span class="info-label">見直しの提案者</span>
        <span class="info-value">
          <div class="selection-display">
--          #foreach($rp in $ruleReviewProposer)
++          #foreach($rp in $ruleReviewProposer.split(","))
              <span class="selection-item">$!escapetool.xml($rp.trim())</span>
            #end
          </div>
@@ -460,12 +460,12 @@
        </span>
      </div>
      #end
--    #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
++    #if($ruleReviewImplementer && $ruleReviewImplementer != '')
      <div class="info-row">
        <span class="info-label">見直しの実施者</span>
        <span class="info-value">
          <div class="selection-display">
--          #foreach($ri in $ruleReviewImplementer)
++          #foreach($ri in $ruleReviewImplementer.split(","))
              <span class="selection-item">$!escapetool.xml($ri.trim())</span>
            #end
          </div>
@@ -941,6 +941,59 @@
  {{/html}}
  #end
++## --- 年度アーカイブ セクション ---
++{{html clean="false"}}
++<div class="school-section-card school-archive-card">
++  <h2 class="archive-section-title">
++    <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
++    年度アーカイブ
++  </h2>
++  <div class="archive-meta">
++    現在のページ: <strong>${pageFiscalYear}年度</strong>
++    #set($lyud = $!doc.getValue('lastYearUpdateDate'))
++    #if($lyud && $lyud != '')
++      | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
++    #end
++  </div>
++
++  ## 過去アーカイブの検索
++  #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
++  #set($archivePages = $archiveQuery.execute())
++
++  #if($archivePages && $archivePages.size() > 0)
++  <div class="archive-card-field-lg">
++    <div class="archive-list-label">過去の年度アーカイブ</div>
++    <div class="archive-list">
++      #foreach($archPage in $archivePages)
++        #set($archPageDoc = $xwiki.getDocument($archPage))
++        #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
++        #if($archPageObj)
++          #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
++          <a href="$archPageDoc.getURL('view')" class="archive-link">
++            <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
++            ${archPageFY}年度
++          </a>
++        #end
++      #end
++    </div>
++  </div>
++  #else
++  <div class="archive-empty">過去のアーカイブはまだありません</div>
++  #end
++
++  ## 新年度に移行ボタン（承認済み・管理者のみ）
++  #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
++  <div class="archive-action">
++    <a href="/bin/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
++      <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
++      ${pageFiscalYear}年度をアーカイブして新年度に移行
++    </a>
++    <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
++  </div>
++  #end
++</div>
++{{/html}}
++
  ## --- 年度タブ切り替え JavaScript ---
  {{html clean="false"}}
  <script>
@@ -963,6 +963,9 @@
    var defaultTab = document.querySelector('.activity-fy-tab.active');
    if (defaultTab) { defaultTab.click(); }
    // 保存成功時のトースト通知
++  if (window.location.search.indexOf('archived=1') !== -1) {
++    showToast('年度アーカイブを作成しました', 'success');
++  }
    if (window.location.search.indexOf('saved=1') !== -1) {
      showToast('学校情報を保存しました', 'success');
      // URLパラメータをクリーンアップ（リロード時に再表示されないよう）