Skip to Content

Changes for page 学校一覧

Last modified by Super Admin on 2026/03/23 10:15
From version Icon 32.1 Icon
edited by Super Admin
on 2026/03/21 18:07
Change comment: There is no comment for this version
To version Icon 18.1 Icon
edited by XWikiGuest
on 2026/03/09 11:57
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  
... ... @@ -52,11 +52,6 @@
52 52   class="sort-toggle #if($sortParam == 'pref')active#end">
53 53   <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> 都道府県順
54 54   </a>
55 - #if($listViewerUser != 'XWiki.XWikiGuest')
56 - <a href="/bin/SeitokaiCode/CreateSchool" class="sort-toggle" style="margin-left:var(--sp-2); color:var(--primary); border-color:var(--primary);">
57 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 学校を追加
58 - </a>
59 - #end
60 60   </div>
61 61  </div>
62 62  {{/html}}
... ... @@ -84,15 +84,13 @@
84 84   #set($actCount = $schoolDoc.getObjects('SeitokaiCode.ActivityClass').size())
85 85   ## 投稿数をカウント（全活動の投稿合計）
86 86   #set($postCount = $schoolDoc.getObjects('SeitokaiCode.ActivityPostClass').size())
87 - ## 特色ある活動の数とタイトルを収集
62 + ## 特色ある活動の数をカウント
88 88   #set($schoolActivities = $schoolDoc.getObjects('SeitokaiCode.ActivityClass'))
89 89   #set($featuredCount = 0)
90 - #set($featuredTitles = [])
91 91   #if($schoolActivities)
92 92   #foreach($sa in $schoolActivities)
93 93   #if($!sa.getValue('featured') == '1')
94 94   #set($featuredCount = $featuredCount + 1)
95 - #set($discard = $featuredTitles.add($!sa.getValue('title')))
96 96   #end
97 97   #end
98 98   #end
... ... @@ -105,14 +105,10 @@
105 105   </div>
106 106   #end
107 107  
108 - #set($sHidden = $!schoolObj.getValue('hidden'))
109 - <a href="$schoolDoc.getURL('view')" class="school-card #if($sHidden == 1)school-card-hidden#end">
81 + <a href="$schoolDoc.getURL('view')" class="school-card">
110 110   <div class="school-card-body">
111 111   <div class="school-card-header-row">
112 112   <div class="school-card-name">$!escapetool.xml($sName)</div>
113 - #if($sHidden == 1)
114 - <span class="badge-hidden">非表示</span>
115 - #end
116 116   #if($sEst)
117 117   <span class="school-card-badge #if($sEst == '公立')public#elseif($sEst == '私立')private#else national#end">$!escapetool.xml($sEst)</span>
118 118   #end
... ... @@ -120,14 +120,12 @@
120 120   <div class="school-card-meta">
121 121   $!escapetool.xml($sPref) $!escapetool.xml($sCity)
122 122   #if($sCoed) ・ $!escapetool.xml($sCoed)#end
123 - #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
124 124   </div>
125 - ## 特色ある活動タイトル
94 + ## 特色ある活動バッジ
126 126   #if($featuredCount > 0)
127 - <div class="school-card-featured-titles">
128 - #foreach($ft in $featuredTitles)
129 - <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>
130 - #end
96 + <div class="school-card-featured-wrap">
97 + <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>
131 131   </div>
132 132   #end
133 133   <div class="school-card-stats">