Changes for page 学校一覧

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

From version Icon 25.1 Icon
edited by Super Admin
on 2026/03/17 13:16
Change comment: There is no comment for this version
To version Icon 16.1 Icon
edited by XWikiGuest
on 2026/03/08 09:23
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.superadmin
1 +XWiki.XWikiGuest
Content
... ... @@ -3,37 +3,17 @@
3 3  ## ソート: 更新順(デフォルト)/ 都道府県順
4 4  ## カード形式で表示し、活動数・投稿数・最終更新日を表示
5 5  
6 -## --- 閲覧者情報(非表示校フィルタ用) ---
7 -#set($listViewerUser = $xcontext.user)
8 -#set($isListAdmin = false)
9 -#if($listViewerUser != 'XWiki.XWikiGuest')
10 - #set($listViewerDoc = $xwiki.getDocument($listViewerUser))
11 - #set($listViewerAccountType = $!listViewerDoc.getValue('accountType'))
12 - #if($listViewerAccountType == 'admin')
13 - #set($isListAdmin = true)
14 - #end
15 -#end
16 -
17 17  #set($sortParam = $!request.sort)
18 18  #if(!$sortParam || $sortParam == '')
19 19   #set($sortParam = 'updated')
20 20  #end
21 21  
22 -## ソート順に応じたXWQLクエリ(非表示校フィルタ付き)
23 -#if($isListAdmin)
24 - ## 管理者: 全校表示
25 - #if($sortParam == 'pref')
26 - #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by school.prefecture, school.schoolName"))
27 - #else
28 - #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by doc.date desc"))
29 - #end
11 +## ソート順に応じたXWQLクエリ
12 +#if($sortParam == 'pref')
13 + #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by school.prefecture, school.schoolName"))
30 30  #else
31 - ## 一般: 非表示校を除外
32 - #if($sortParam == 'pref')
33 - #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"))
34 - #else
35 - #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"))
36 - #end
15 + ## 更新順: ドキュメントの最終更新日でソート(降順)
16 + #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by doc.date desc"))
37 37  #end
38 38  #set($results = $query.execute())
39 39  
... ... @@ -79,15 +79,13 @@
79 79   #set($actCount = $schoolDoc.getObjects('SeitokaiCode.ActivityClass').size())
80 80   ## 投稿数をカウント(全活動の投稿合計)
81 81   #set($postCount = $schoolDoc.getObjects('SeitokaiCode.ActivityPostClass').size())
82 - ## 特色ある活動の数とタイトル収集
62 + ## 特色ある活動の数をカウント
83 83   #set($schoolActivities = $schoolDoc.getObjects('SeitokaiCode.ActivityClass'))
84 84   #set($featuredCount = 0)
85 - #set($featuredTitles = [])
86 86   #if($schoolActivities)
87 87   #foreach($sa in $schoolActivities)
88 88   #if($!sa.getValue('featured') == '1')
89 89   #set($featuredCount = $featuredCount + 1)
90 - #set($discard = $featuredTitles.add($!sa.getValue('title')))
91 91   #end
92 92   #end
93 93   #end
... ... @@ -100,14 +100,10 @@
100 100   </div>
101 101   #end
102 102  
103 - #set($sHidden = $!schoolObj.getValue('hidden'))
104 - <a href="$schoolDoc.getURL('view')" class="school-card #if($sHidden == 1)school-card-hidden#end">
81 + <a href="$schoolDoc.getURL('view')" class="school-card">
105 105   <div class="school-card-body">
106 106   <div class="school-card-header-row">
107 107   <div class="school-card-name">$!escapetool.xml($sName)</div>
108 - #if($sHidden == 1)
109 - <span class="badge-hidden">非表示</span>
110 - #end
111 111   #if($sEst)
112 112   <span class="school-card-badge #if($sEst == '公立')public#elseif($sEst == '私立')private#else national#end">$!escapetool.xml($sEst)</span>
113 113   #end
... ... @@ -115,7 +115,7 @@
115 115   <div class="school-card-meta">
116 116   $!escapetool.xml($sPref) $!escapetool.xml($sCity)
117 117   #if($sCoed) ・ $!escapetool.xml($sCoed)#end
118 - #if($sSystem && !$sSystem.isEmpty())#foreach($__sys in $sSystem)#if($foreach.count > 1)・#end$!escapetool.xml($__sys)#end#end
92 + #if($sSystem) ・ $!escapetool.xml($sSystem)#end
119 119   </div>
120 120   ## 特色ある活動バッジ
121 121   #if($featuredCount > 0)
... ... @@ -122,11 +122,6 @@
122 122   <div class="school-card-featured-wrap">
123 123   <span class="badge-featured"><svg class="ico ico-fixed-14" 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>
124 124   </div>
125 - <div class="school-card-featured-titles">
126 - #foreach($ft in $featuredTitles)
127 - <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>
128 - #end
129 - </div>
130 130   #end
131 131   <div class="school-card-stats">
132 132   <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>