Changes for page 学校一覧

Last modified by Super Admin on 2026/03/23 10:15

Edit

Create

From 2.1 to 3.1 From 28.1 to 29.1

From version

3.1

edited by Super Admin
on 2026/03/06 00:42

Change comment: There is no comment for this version

To version

28.1

edited by Super Admin
on 2026/03/18 12:01

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -3,37 +3,54 @@
  ## ソート: 更新順（デフォルト）/ 都道府県順
  ## カード形式で表示し、活動数・投稿数・最終更新日を表示
++## --- 閲覧者情報（非表示校フィルタ用） ---
++#set($listViewerUser = $xcontext.user)
++#set($isListAdmin = false)
++#if($listViewerUser != 'XWiki.XWikiGuest')
++  #set($listViewerDoc = $xwiki.getDocument($listViewerUser))
++  #set($listViewerAccountType = $!listViewerDoc.getValue('accountType'))
++  #if($listViewerAccountType == 'admin')
++    #set($isListAdmin = true)
++  #end
++#end
++
  #set($sortParam = $!request.sort)
  #if(!$sortParam || $sortParam == '')
    #set($sortParam = 'updated')
  #end
--## ソート順に応じたXWQLクエリ
--#if($sortParam == 'pref')
--  #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by school.prefecture, school.schoolName"))
++## ソート順に応じたXWQLクエリ（非表示校フィルタ付き）
++#if($isListAdmin)
++  ## 管理者: 全校表示
++  #if($sortParam == 'pref')
++    #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by school.prefecture, school.schoolName"))
++  #else
++    #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by doc.date desc"))
++  #end
  #else
--  ## 更新順: ドキュメントの最終更新日でソート（降順）
--  #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by doc.date desc"))
++  ## 一般: 非表示校を除外
++  #if($sortParam == 'pref')
++    #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school where (school.hidden <> 1 or school.hidden is null) order by school.prefecture, school.schoolName"))
++  #else
++    #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school where (school.hidden <> 1 or school.hidden is null) order by doc.date desc"))
++  #end
  #end
  #set($results = $query.execute())
--= <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 登録されている学校 =
--
  {{html clean="false"}}
--<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:20px;flex-wrap:wrap;gap:10px;">
--  <div style="font-size:0.9em;color:#64748b;">
++<h1 class="home-section-title">登録されている学校</h1>
++<div class="sort-header">
++  <div class="school-count">
      $results.size() 校が登録されています
    </div>
--  <div style="display:flex;gap:4px;background:#f1f5f9;border-radius:8px;padding:3px;">
++  <div class="sort-toggle-group">
      <a href="$doc.getURL('view', 'sort=updated')"
--       style="padding:6px 14px;border-radius:6px;font-size:0.84em;font-weight:600;text-decoration:none;display:inline-flex;align-items:center;gap:4px;
--              #if($sortParam == 'updated')background:#fff;color:#1e293b;box-shadow:0 1px 3px rgba(0,0,0,0.1);#else color:#64748b;#end">
--      <svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 更新順
++       class="sort-toggle #if($sortParam == 'updated')active#end">
++      <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 更新順
      </a>
      <a href="$doc.getURL('view', 'sort=pref')"
--       style="padding:6px 14px;border-radius:6px;font-size:0.84em;font-weight:600;text-decoration:none;display:inline-flex;align-items:center;gap:4px;
--              #if($sortParam == 'pref')background:#fff;color:#1e293b;box-shadow:0 1px 3px rgba(0,0,0,0.1);#else color:#64748b;#end">
--      <svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0118 0z"/><circle cx="12" cy="10" r="3"/></svg> 都道府県順
++       class="sort-toggle #if($sortParam == 'pref')active#end">
++      <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0118 0z"/><circle cx="12" cy="10" r="3"/></svg> 都道府県順
      </a>
    </div>
  </div>
@@ -45,7 +45,7 @@
  #set($currentPref = '')
  {{html clean="false"}}
--<div style="display:grid;grid-template-columns:repeat(auto-fill, minmax(320px, 1fr));gap:16px;">
++<div class="school-card-grid">
  #foreach($docName in $results)
    #set($schoolDoc = $xwiki.getDocument($docName))
    #set($schoolObj = $schoolDoc.getObject('SeitokaiCode.SchoolClass'))
@@ -62,13 +62,15 @@
      #set($actCount = $schoolDoc.getObjects('SeitokaiCode.ActivityClass').size())
      ## 投稿数をカウント（全活動の投稿合計）
      #set($postCount = $schoolDoc.getObjects('SeitokaiCode.ActivityPostClass').size())
--    ## 特色ある活動の数をカウント
++    ## 特色ある活動の数とタイトルを収集
      #set($schoolActivities = $schoolDoc.getObjects('SeitokaiCode.ActivityClass'))
      #set($featuredCount = 0)
++    #set($featuredTitles = [])
      #if($schoolActivities)
        #foreach($sa in $schoolActivities)
          #if($!sa.getValue('featured') == '1')
            #set($featuredCount = $featuredCount + 1)
++          #set($discard = $featuredTitles.add($!sa.getValue('title')))
          #end
        #end
      #end
@@ -76,39 +76,40 @@
      ## 都道府県グループヘッダー（都道府県順の場合）
      #if($sortParam == 'pref' && $sPref != $currentPref)
        #set($currentPref = $sPref)
--      <div style="grid-column:1/-1;margin-top:12px;padding:8px 0;border-bottom:2px solid #e2e8f0;">
--        <span style="font-size:1.05em;font-weight:700;color:#1e293b;display:inline-flex;align-items:center;gap:4px;"><svg style="width:16px;height:16px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0118 0z"/><circle cx="12" cy="10" r="3"/></svg> $escapetool.xml($currentPref)</span>
++      <div class="pref-group-header">
++        <span class="pref-group-label"><svg class="ico ico-fixed-16" viewBox="0 0 24 24"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0118 0z"/><circle cx="12" cy="10" r="3"/></svg> $!escapetool.xml($currentPref)</span>
        </div>
      #end
--    <a href="$schoolDoc.getURL('view')" style="text-decoration:none;color:inherit;display:block;background:#fff;border:1px solid #e5e7eb;border-radius:12px;overflow:hidden;transition:box-shadow 0.2s,transform 0.1s;"
--       onmouseover="this.style.boxShadow='0 4px 12px rgba(0,0,0,0.08)';this.style.transform='translateY(-1px)'"
--       onmouseout="this.style.boxShadow='';this.style.transform=''">
--      <div style="padding:16px 20px;">
--        <div style="display:flex;align-items:center;gap:8px;margin-bottom:4px;flex-wrap:wrap;">
--          <div style="font-weight:700;font-size:0.95em;color:#1e293b;">$escapetool.xml($sName)</div>
++    #set($sHidden = $!schoolObj.getValue('hidden'))
++    <a href="$schoolDoc.getURL('view')" class="school-card #if($sHidden == 1)school-card-hidden#end">
++      <div class="school-card-body">
++        <div class="school-card-header-row">
++          <div class="school-card-name">$!escapetool.xml($sName)</div>
++          #if($sHidden == 1)
++            <span class="badge-hidden">非表示</span>
++          #end
            #if($sEst)
--            <span style="font-size:0.72em;padding:2px 8px;border-radius:4px;font-weight:600;
--              #if($sEst == '公立')background:#dbeafe;color:#1d4ed8;
--              #elseif($sEst == '私立')background:#fce7f3;color:#be185d;
--              #else background:#f3e8ff;color:#7c3aed;#end">$escapetool.xml($sEst)</span>
++            <span class="school-card-badge #if($sEst == '公立')public#elseif($sEst == '私立')private#else national#end">$!escapetool.xml($sEst)</span>
            #end
          </div>
--        <div style="font-size:0.82em;color:#94a3b8;margin-bottom:8px;">
--          $escapetool.xml($sPref) $escapetool.xml($sCity)
--          #if($sCoed) ・ $escapetool.xml($sCoed)#end
--          #if($sSystem) ・ $escapetool.xml($sSystem)#end
++        <div class="school-card-meta">
++          $!escapetool.xml($sPref) $!escapetool.xml($sCity)
++          #if($sCoed) ・ $!escapetool.xml($sCoed)#end
++          #if($sSystem && !$sSystem.isEmpty()) ・ #foreach($__sys in $sSystem)#if($foreach.count > 1)・#end$!escapetool.xml($__sys)#end#end
          </div>
--        ## 特色ある活動バッジ
++        ## 特色ある活動タイトル
          #if($featuredCount > 0)
--        <div style="display:flex;gap:4px;flex-wrap:wrap;margin-bottom:8px;">
--          <span style="font-size:0.72em;padding:2px 8px;background:#fef3c7;color:#92400e;border-radius:4px;font-weight:600;display:inline-flex;align-items:center;gap:3px;"><svg style="width:11px;height:11px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色ある活動 ${featuredCount}件</span>
++        <div class="school-card-featured-titles">
++          #foreach($ft in $featuredTitles)
++            <span class="featured-title-item"><svg class="ico ico-fixed-12" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> $!escapetool.xml($ft)</span>
++          #end
          </div>
          #end
--        <div style="display:flex;gap:14px;font-size:0.8em;color:#94a3b8;">
--          <span style="display:inline-flex;align-items:center;gap:3px;"><svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 活動 <strong style="color:#334155;">$actCount</strong>件</span>
--          <span style="display:inline-flex;align-items:center;gap:3px;"><svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> 投稿 <strong style="color:#334155;">$postCount</strong>件</span>
--          <span style="display:inline-flex;align-items:center;gap:3px;"><svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 更新 $lastUpdate</span>
++        <div class="school-card-stats">
++          <span><svg class="ico ico-fixed-14" 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> 活動 <span class="num">$actCount</span>件</span>
++          <span><svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> 投稿 <span class="num">$postCount</span>件</span>
++          <span><svg class="ico ico-fixed-14" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 更新 $lastUpdate</span>
          </div>
        </div>
      </a>