Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 46.1 Icon
edited by Super Admin
on 2026/03/13 14:24
Change comment: There is no comment for this version
To version Icon 43.1 Icon
edited by Super Admin
on 2026/03/12 17:54
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -102,12 +102,8 @@
102 102  
103 103  ## --- 投稿固定/解除処理 ---
104 104  #set($pinAction = $!request.action)
105 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
106 - #set($pinPostObjStr = $!request.postObj)
107 - #if(!$pinPostObjStr.matches('^\d+$'))
108 - ## 不正な値 → 無視
109 - #else
110 - #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
105 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
106 + #set($postObjNum = $mathtool.toInteger($!request.postObj))
111 111   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
112 112   #if($postObj)
113 113   #if($pinAction == 'pin')
... ... @@ -127,15 +127,12 @@
127 127   $response.sendRedirect($doc.getURL('view'))
128 128   #stop
129 129   #end
130 - #end## /matches
131 131  #end
132 132  
133 133  ## --- 特色ある活動 選定/解除処理 ---
134 134  #set($featAction = $!request.action)
135 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
136 - #set($featActObjStr = $!request.actObj)
137 - #if($featActObjStr.matches('^\d+$'))
138 - #set($actObjNum = $mathtool.toInteger($featActObjStr))
130 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
131 + #set($actObjNum = $mathtool.toInteger($!request.actObj))
139 139   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
140 140   #if($actObj)
141 141   #if($featAction == 'feature')
... ... @@ -167,7 +167,6 @@
167 167   $response.sendRedirect($doc.getURL('view'))
168 168   #stop
169 169   #end
170 - #end## /matches
171 171  #end
172 172  
173 173  ## --- ユーザー情報取得 ---
... ... @@ -246,7 +246,7 @@
246 246  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
247 247  <div class="school-info-grid">
248 248   <div class="school-info-card collapsed" id="card-basic-info">
249 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
241 + <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
250 250   <table class="wiki-table school-info-table">
251 251   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
252 252   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
... ... @@ -255,7 +255,7 @@
255 255   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
256 256   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
257 257   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
258 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
250 + <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
259 259   <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
260 260   </table>
261 261   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -266,7 +266,7 @@
266 266   </div>
267 267  
268 268   <div class="school-info-card collapsed" id="card-contact">
269 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
261 + <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
270 270   <table class="wiki-table school-info-table">
271 271   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
272 272   <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
... ... @@ -313,7 +313,7 @@
313 313  
314 314  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
315 315  <div class="school-section-grid">
316 - #if($dailyActivities && !$dailyActivities.isEmpty())
308 + #if($dailyActivities && $dailyActivities != '')
317 317   <div class="school-section-card">
318 318   <h3><svg class="ico" 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> 日常の活動</h3>
319 319   <div class="card-inner">
... ... @@ -320,7 +320,7 @@
320 320   <p class="activity-hint">活動時間の多い順に上位3つ</p>
321 321   <div class="tag-container">
322 322   #set($daIdx = 1)
323 - #foreach($da in $dailyActivities)
315 + #foreach($da in $dailyActivities.split(","))
324 324   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
325 325   #set($daIdx = $daIdx + 1)
326 326   #end
... ... @@ -371,7 +371,7 @@
371 371   #end
372 372  
373 373   ## --- ⑦ 予算 ---
374 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
366 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
375 375   #if($hasBudget)
376 376   ## 公開範囲チェック
377 377   #set($canViewBudget = true)
... ... @@ -382,12 +382,12 @@
382 382   <div class="school-section-card">
383 383   <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
384 384   <div class="card-inner">
385 - #if($budgetProcess && !$budgetProcess.isEmpty())
377 + #if($budgetProcess && $budgetProcess != '')
386 386   <div class="info-row">
387 387   <span class="info-label">作成過程の生徒関与</span>
388 388   <span class="info-value">
389 389   <div class="selection-display">
390 - #foreach($bp in $budgetProcess)
382 + #foreach($bp in $budgetProcess.split(","))
391 391   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
392 392   #end
393 393   </div>
... ... @@ -406,12 +406,12 @@
406 406   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
407 407   </div>
408 408   #end
409 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
401 + #if($budgetAllocation && $budgetAllocation != '')
410 410   <div class="info-row">
411 411   <span class="info-label">主な予算配分</span>
412 412   <span class="info-value">
413 413   <div class="selection-display">
414 - #foreach($ba in $budgetAllocation)
406 + #foreach($ba in $budgetAllocation.split(","))
415 415   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
416 416   #end
417 417   </div>
... ... @@ -444,12 +444,12 @@
444 444   <span class="info-label">見直しの有無（3年以内）</span>
445 445   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
446 446   </div>
447 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
439 + #if($ruleReviewContent && $ruleReviewContent != '')
448 448   <div class="info-row">
449 449   <span class="info-label">見直しの内容</span>
450 450   <span class="info-value">
451 451   <div class="selection-display">
452 - #foreach($rc in $ruleReviewContent)
444 + #foreach($rc in $ruleReviewContent.split(","))
453 453   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
454 454   #end
455 455   </div>
... ... @@ -456,12 +456,12 @@
456 456   </span>
457 457   </div>
458 458   #end
459 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
451 + #if($ruleReviewProposer && $ruleReviewProposer != '')
460 460   <div class="info-row">
461 461   <span class="info-label">見直しの提案者</span>
462 462   <span class="info-value">
463 463   <div class="selection-display">
464 - #foreach($rp in $ruleReviewProposer)
456 + #foreach($rp in $ruleReviewProposer.split(","))
465 465   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
466 466   #end
467 467   </div>
... ... @@ -468,12 +468,12 @@
468 468   </span>
469 469   </div>
470 470   #end
471 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
463 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
472 472   <div class="info-row">
473 473   <span class="info-label">見直しの実施者</span>
474 474   <span class="info-value">
475 475   <div class="selection-display">
476 - #foreach($ri in $ruleReviewImplementer)
468 + #foreach($ri in $ruleReviewImplementer.split(","))
477 477   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
478 478   #end
479 479   </div>
... ... @@ -635,7 +635,7 @@
635 635  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
636 636   <div class="activity-thread-header">
637 637   <div class="activity-thread-title">
638 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" 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>#end</h3>
630 + <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><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>#end</h3>
639 639   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
640 640   </div>
641 641   <div class="thread-meta-row">
... ... @@ -1006,9 +1006,6 @@
1006 1006   var card = document.getElementById(cardId);
1007 1007   if (!card) return;
1008 1008   card.classList.toggle('collapsed');
1009 - var isCollapsed = card.classList.contains('collapsed');
1010 - var h2 = card.querySelector('h2[role="button"]');
1011 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1012 1012  }
1013 1013  
1014 1014  // 投稿の編集（インライン編集フォームを開く）