Changes for page 学校一覧

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

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

Summary

Details

Icon Page properties
Content
... ... @@ -3,17 +3,37 @@
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 +
6 6  #set($sortParam = $!request.sort)
7 7  #if(!$sortParam || $sortParam == '')
8 8   #set($sortParam = 'updated')
9 9  #end
10 10  
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"))
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
14 14  #else
15 - ## 更新順: ドキュメントの最終更新日でソート(降順)
16 - #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by doc.date desc"))
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
17 17  #end
18 18  #set($results = $query.execute())
19 19  
... ... @@ -78,10 +78,14 @@
78 78   </div>
79 79   #end
80 80  
81 - <a href="$schoolDoc.getURL('view')" class="school-card">
101 + #set($sHidden = $!schoolObj.getValue('hidden'))
102 + <a href="$schoolDoc.getURL('view')" class="school-card #if($sHidden == 1)school-card-hidden#end">
82 82   <div class="school-card-body">
83 83   <div class="school-card-header-row">
84 84   <div class="school-card-name">$!escapetool.xml($sName)</div>
106 + #if($sHidden == 1)
107 + <span class="badge-hidden">非表示</span>
108 + #end
85 85   #if($sEst)
86 86   <span class="school-card-badge #if($sEst == '公立')public#elseif($sEst == '私立')private#else national#end">$!escapetool.xml($sEst)</span>
87 87   #end