Changes for page 学校一覧

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

From version Icon 24.1 Icon
edited by Super Admin
on 2026/03/14 15:45
Change comment: There is no comment for this version
To version Icon 15.1 Icon
edited by Super Admin
on 2026/03/08 00:14
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
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  
... ... @@ -98,14 +98,10 @@
98 98   </div>
99 99   #end
100 100  
101 - #set($sHidden = $!schoolObj.getValue('hidden'))
102 - <a href="$schoolDoc.getURL('view')" class="school-card #if($sHidden == 1)school-card-hidden#end">
81 + <a href="$schoolDoc.getURL('view')" class="school-card">
103 103   <div class="school-card-body">
104 104   <div class="school-card-header-row">
105 105   <div class="school-card-name">$!escapetool.xml($sName)</div>
106 - #if($sHidden == 1)
107 - <span class="badge-hidden">非表示</span>
108 - #end
109 109   #if($sEst)
110 110   <span class="school-card-badge #if($sEst == '公立')public#elseif($sEst == '私立')private#else national#end">$!escapetool.xml($sEst)</span>
111 111   #end
... ... @@ -113,7 +113,7 @@
113 113   <div class="school-card-meta">
114 114   $!escapetool.xml($sPref) $!escapetool.xml($sCity)
115 115   #if($sCoed) ・ $!escapetool.xml($sCoed)#end
116 - #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
117 117   </div>
118 118   ## 特色ある活動バッジ
119 119   #if($featuredCount > 0)