Last modified by Super Admin on 2026/04/05 18:59

From version Icon 74.1 Icon
edited by Super Admin
on 2026/03/19 12:32
Change comment: There is no comment for this version
To version Icon 96.1 Icon
edited by Super Admin
on 2026/03/20 18:06
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -35,8 +35,9 @@
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 37  #set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 +#set($schoolDescription = $doc.getValue('schoolDescription'))
38 38  
39 -## --- 組織 ---
40 +## --- 生徒会組織 ---
40 40  #set($orgChart = $doc.getValue('orgChart'))
41 41  #set($orgChartImage = $doc.getValue('orgChartImage'))
42 42  
... ... @@ -56,7 +56,7 @@
56 56  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
57 57  #set($budgetNote = $doc.getValue('budgetNote'))
58 58  
59 -## --- 校則の見直し ---
60 +## --- 校則・生徒会会則の見直し ---
60 60  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
61 61  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
62 62  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -63,6 +63,43 @@
63 63  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
64 64  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
65 65  
67 +## --- 活動環境 ---
68 +#set($activityPlace = $doc.getValue('activityPlace'))
69 +#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 +#set($activityRoomImage = $doc.getValue('activityRoomImage'))
71 +#set($ictUsage = $doc.getValue('ictUsage'))
72 +
73 +## --- 生徒総会 ---
74 +#set($assemblyFormat = $doc.getValue('assemblyFormat'))
75 +#set($assemblyCount = $doc.getValue('assemblyCount'))
76 +#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
77 +#set($assemblyTopics = $doc.getValue('assemblyTopics'))
78 +#set($assemblyNote = $doc.getValue('assemblyNote'))
79 +
80 +## --- 広報 ---
81 +#set($publicityMethod = $doc.getValue('publicityMethod'))
82 +#set($publicityFrequency = $doc.getValue('publicityFrequency'))
83 +#set($publicityNote = $doc.getValue('publicityNote'))
84 +
85 +## --- 外部連携 ---
86 +#set($externalCooperation = $doc.getValue('externalCooperation'))
87 +#set($externalOrgName = $doc.getValue('externalOrgName'))
88 +#set($socialParticipation = $doc.getValue('socialParticipation'))
89 +
90 +## --- 年間主要行事 ---
91 +#set($eventApril = $doc.getValue('eventApril'))
92 +#set($eventMay = $doc.getValue('eventMay'))
93 +#set($eventJune = $doc.getValue('eventJune'))
94 +#set($eventJuly = $doc.getValue('eventJuly'))
95 +#set($eventAugust = $doc.getValue('eventAugust'))
96 +#set($eventSeptember = $doc.getValue('eventSeptember'))
97 +#set($eventOctober = $doc.getValue('eventOctober'))
98 +#set($eventNovember = $doc.getValue('eventNovember'))
99 +#set($eventDecember = $doc.getValue('eventDecember'))
100 +#set($eventJanuary = $doc.getValue('eventJanuary'))
101 +#set($eventFebruary = $doc.getValue('eventFebruary'))
102 +#set($eventMarch = $doc.getValue('eventMarch'))
103 +
66 66  ## --- 課題・連絡先 ---
67 67  #set($challenges = $doc.getValue('challenges'))
68 68  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -87,6 +87,14 @@
87 87  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
88 88  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
89 89  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
128 +#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
129 +#set($visibilityElection = $!doc.getValue('visibilityElection'))
130 +#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
131 +#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
132 +#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
133 +#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
134 +#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
135 +#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
90 90  ## デフォルト値(未設定なら全体公開)
91 91  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
92 92  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -303,7 +303,7 @@
303 303  
304 304  ## --- 編集ボタン(権限があるユーザーのみ表示) ---
305 305  #set($canEditSchool = false)
306 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
352 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
307 307   #set($canEditSchool = true)
308 308  #end
309 309  #if($canEditSchool)
... ... @@ -353,19 +353,18 @@
353 353   </div>
354 354   #end
355 355   </div>
356 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 - #if($infoEditDate && $infoEditDate != '')
359 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
402 + #if($schoolDescription && $schoolDescription.trim() != '')
403 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
360 360   #end
405 +
361 361  </div>
362 362  
363 -## --- ② 生徒会基本情報(折りたたみカード) ---
408 +## --- ② 生徒会情報(折りたたみカード) ---
364 364  <div class="school-info-card" id="card-seitokai-info">
365 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
410 + <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
366 366   <div class="seitokai-info-body">
367 367  
368 - ## --- 組織 ---
413 + ## --- 生徒会組織 ---
369 369   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 370   #if($hasOrgContent)
371 371   #set($canViewOrgChart = true)
... ... @@ -374,16 +374,16 @@
374 374   #end
375 375   #if($canViewOrgChart)
376 376   <div class="seitokai-subsection">
377 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
422 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
378 378   <div class="seitokai-subsection-content">
379 379   #if($orgChartImage && $orgChartImage != '')
380 380   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
381 381   #end
382 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
427 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
383 383   </div>
384 384   </div>
385 385   #else
386 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
431 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
387 387   #end
388 388   #end
389 389  
... ... @@ -392,12 +392,10 @@
392 392   <div class="seitokai-subsection">
393 393   <h3 class="seitokai-subsection-title"><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>
394 394   <div class="seitokai-subsection-content">
395 - <p class="activity-hint">活動時間多い順に上位3つ</p>
440 + <p class="activity-hint">活動時間多い3つ</p>
396 396   <div class="tag-container">
397 - #set($daIdx = 1)
398 398   #foreach($da in $dailyActivities)
399 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
400 - #set($daIdx = $daIdx + 1)
443 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
401 401   #end
402 402   </div>
403 403   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -454,7 +454,7 @@
454 454   #end
455 455   #if($canViewBudget)
456 456   <div class="seitokai-subsection">
457 - <h3 class="seitokai-subsection-title"><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 == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
500 + <h3 class="seitokai-subsection-title"><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 == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
458 458   <div class="seitokai-subsection-content">
459 459   #if($budgetProcess && !$budgetProcess.isEmpty())
460 460   <div class="info-row">
... ... @@ -461,8 +461,13 @@
461 461   <span class="info-label">作成過程の生徒関与</span>
462 462   <span class="info-value">
463 463   <div class="selection-display">
464 - #foreach($bp in $budgetProcess)
465 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
507 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
508 + #foreach($bpOpt in $allBpOpts)
509 + #if($budgetProcess.contains($bpOpt))
510 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
511 + #else
512 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
513 + #end
466 466   #end
467 467   </div>
468 468   </span>
... ... @@ -502,7 +502,7 @@
502 502   #end
503 503   #end
504 504  
505 - ## --- 校則の見直し ---
553 + ## --- 校則・生徒会会則の見直し ---
506 506   #if($ruleReviewStatus && $ruleReviewStatus != '')
507 507   #set($canViewRuleReview = true)
508 508   #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
... ... @@ -510,12 +510,13 @@
510 510   #end
511 511   #if($canViewRuleReview)
512 512   <div class="seitokai-subsection">
513 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
561 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則・生徒会会則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
514 514   <div class="seitokai-subsection-content">
515 515   <div class="info-row">
516 516   <span class="info-label">見直しの有無(3年以内)</span>
517 517   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
518 518   </div>
567 + #if($ruleReviewStatus != '実施なし')
519 519   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
520 520   <div class="info-row">
521 521   <span class="info-label">見直しの内容</span>
... ... @@ -552,6 +552,7 @@
552 552   </span>
553 553   </div>
554 554   #end
604 + #end
555 555   #if($ruleReviewSystem && $ruleReviewSystem != '')
556 556   <div class="info-row">
557 557   <span class="info-label">見直しの仕組み</span>
... ... @@ -561,10 +561,197 @@
561 561   </div>
562 562   </div>
563 563   #else
564 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
614 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則・生徒会会則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
565 565   #end
566 566   #end
567 567  
618 + ## --- 活動環境 ---
619 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
620 + #if($hasActivityEnv)
621 + <div class="seitokai-subsection">
622 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
623 + <div class="seitokai-subsection-content">
624 + #if($activityPlace && !$activityPlace.isEmpty())
625 + <div class="info-row">
626 + <span class="info-label">普段の活動場所</span>
627 + <span class="info-value">
628 + <div class="selection-display">
629 + #foreach($ap in $activityPlace)
630 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
631 + #end
632 + </div>
633 + </span>
634 + </div>
635 + #end
636 + #if($activityRoomEquipment && $activityRoomEquipment != '')
637 + <div class="info-row">
638 + <span class="info-label">生徒会室の設備</span>
639 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
640 + </div>
641 + #end
642 + #if($activityRoomImage && $activityRoomImage != '')
643 + <div class="info-row">
644 + <span class="info-label">活動場所の写真</span>
645 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
646 + </div>
647 + #end
648 + #if($ictUsage && !$ictUsage.isEmpty())
649 + <div class="info-row">
650 + <span class="info-label">ICT活用している場面</span>
651 + <span class="info-value">
652 + <div class="selection-display">
653 + #foreach($iu in $ictUsage)
654 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
655 + #end
656 + </div>
657 + </span>
658 + </div>
659 + #end
660 + </div>
661 + </div>
662 + #end
663 +
664 + ## --- 生徒総会 ---
665 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
666 + #if($hasAssembly)
667 + <div class="seitokai-subsection">
668 + <h3 class="seitokai-subsection-title"><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> 生徒総会</h3>
669 + <div class="seitokai-subsection-content">
670 + #if($assemblyFormat && $assemblyFormat != '')
671 + <div class="info-row">
672 + <span class="info-label">開催方式</span>
673 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
674 + </div>
675 + #end
676 + #if($assemblyCount && $assemblyCount > 0)
677 + <div class="info-row">
678 + <span class="info-label">開催回数(年)</span>
679 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
680 + </div>
681 + #end
682 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
683 + <div class="info-row">
684 + <span class="info-label">議案の集め方</span>
685 + <span class="info-value">
686 + <div class="selection-display">
687 + #foreach($aa in $assemblyAgenda)
688 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
689 + #end
690 + </div>
691 + </span>
692 + </div>
693 + #end
694 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
695 + <div class="info-row">
696 + <span class="info-label">扱う内容</span>
697 + <span class="info-value">
698 + <div class="selection-display">
699 + #foreach($at in $assemblyTopics)
700 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
701 + #end
702 + </div>
703 + </span>
704 + </div>
705 + #end
706 + #if($assemblyNote && $assemblyNote != '')
707 + <div class="info-row">
708 + <span class="info-label">自由記述</span>
709 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
710 + </div>
711 + #end
712 + </div>
713 + </div>
714 + #end
715 +
716 + ## --- 広報 ---
717 + #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
718 + #if($hasPublicity)
719 + <div class="seitokai-subsection">
720 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
721 + <div class="seitokai-subsection-content">
722 + #if($publicityMethod && !$publicityMethod.isEmpty())
723 + <div class="info-row">
724 + <span class="info-label">方法</span>
725 + <span class="info-value">
726 + <div class="selection-display">
727 + #foreach($pm in $publicityMethod)
728 + <span class="selection-item">$!escapetool.xml($pm.trim())</span>
729 + #end
730 + </div>
731 + </span>
732 + </div>
733 + #end
734 + #if($publicityFrequency && $publicityFrequency != '')
735 + <div class="info-row">
736 + <span class="info-label">頻度</span>
737 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
738 + </div>
739 + #end
740 + #if($publicityNote && $publicityNote != '')
741 + <div class="info-row">
742 + <span class="info-label">自由記述</span>
743 + <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
744 + </div>
745 + #end
746 + </div>
747 + </div>
748 + #end
749 +
750 + ## --- 外部連携 ---
751 + #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
752 + #if($hasExternal)
753 + <div class="seitokai-subsection">
754 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
755 + <div class="seitokai-subsection-content">
756 + #if($externalCooperation && $externalCooperation != '')
757 + <div class="info-row">
758 + <span class="info-label">他校の生徒会との連携</span>
759 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
760 + </div>
761 + #end
762 + #if($externalOrgName && $externalOrgName != '')
763 + <div class="info-row">
764 + <span class="info-label">参加している生徒会団体の名前</span>
765 + <span class="info-value">$!escapetool.xml($externalOrgName)</span>
766 + </div>
767 + #end
768 + #if($socialParticipation && !$socialParticipation.isEmpty())
769 + <div class="info-row">
770 + <span class="info-label">社会参加・地域連携・ボランティア</span>
771 + <span class="info-value">
772 + <div class="selection-display">
773 + #foreach($sp2 in $socialParticipation)
774 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
775 + #end
776 + </div>
777 + </span>
778 + </div>
779 + #end
780 + </div>
781 + </div>
782 + #end
783 +
784 + ## --- 年間主要行事 ---
785 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
786 + #set($hasAnyEvent = false)
787 + #foreach($m in $months)
788 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
789 + #end
790 + #if($hasAnyEvent)
791 + <div class="seitokai-subsection">
792 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事</h3>
793 + <div class="seitokai-subsection-content">
794 + <table class="wiki-table school-info-table" style="margin:0">
795 + #foreach($m in $months)
796 + #if($m.get(1) && $m.get(1) != '')
797 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
798 + #end
799 + #end
800 + </table>
801 + </div>
802 + </div>
803 + #end
804 +
568 568   ## --- 生徒会の課題意識 ---
569 569   #if($challenges && $challenges != '')
570 570   #set($canViewChallenges = true)
... ... @@ -573,7 +573,7 @@
573 573   #end
574 574   #if($canViewChallenges)
575 575   <div class="seitokai-subsection">
576 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
813 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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>
577 577   <div class="seitokai-subsection-content">
578 578   <div class="challenge-text">$!escapetool.xml($challenges)</div>
579 579   </div>
... ... @@ -597,6 +597,11 @@
597 597   <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
598 598   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
599 599   </table>
837 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
838 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
839 + #if($infoEditDate && $infoEditDate != '')
840 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
841 + #end
600 600  </div>
601 601  
602 602  {{/html}}
... ... @@ -736,16 +736,18 @@
736 736  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
737 737   <div class="activity-thread-header">
738 738   <div class="activity-thread-title">
739 - <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>
740 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
741 - #set($actTagsList = $activity.getValue('tags'))
742 - #if($actTagsList && !$actTagsList.isEmpty())
743 - #foreach($tagItem in $actTagsList)
744 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
981 + <h3 #if($actFeatured == '1')class="featured-title"#end>#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$!escapetool.xml($!actTitle)</h3>
982 + <div class="activity-meta-line">
983 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
984 + #set($actTagsList = $activity.getValue('tags'))
985 + #if($actTagsList && !$actTagsList.isEmpty())
986 + #foreach($tagItem in $actTagsList)
987 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
988 + #end
745 745   #end
746 - #end
990 + </div>
747 747   </div>
748 - <div class="thread-meta-row">
992 + <div class="thread-meta-right">
749 749   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
750 750   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
751 751   #if($actFeatured == '1')
... ... @@ -881,6 +881,13 @@
881 881   #if($postEdited == 1 || $postEdited == '1')
882 882   <span class="post-edited-label">(編集済み)</span>
883 883   #end
1128 + #set($postAuthorRefH = $!post.getValue('authorRef'))
1129 + #set($postObjNumH = $post.number)
1130 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1131 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1132 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
1133 + </button>
1134 + #end
884 884   </div>
885 885   <div class="thread-post-body">
886 886   $!escapetool.xml($!postContent)
... ... @@ -945,14 +945,15 @@
945 945   #end
946 946   </div>
947 947   #if($postVis != 'public')
948 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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</div>
1199 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></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</div>
949 949   #end
950 - ## 固定/編集/削除ボタン(横並び)
1201 + ## 固定/編集/削除/通報/非表示ボタン(横並び)
951 951   #set($postAuthorRef = $!post.getValue('authorRef'))
952 952   #set($postObjNumED = $post.number)
953 953   #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
954 954   #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
955 - #if($showPinBtn || $showEditDeleteBtn)
1206 + #set($showHideBtn = ($viewerAccountType == 'admin'))
1207 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
956 956   <div class="post-edit-actions post-action-mt">
957 957   #if($showPinBtn)
958 958   #set($postObjNum = $post.number)
... ... @@ -968,7 +968,9 @@
968 968   #end
969 969   #if($showEditDeleteBtn)
970 970   #if($xcontext.user == $postAuthorRef)
971 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1223 + #set($editImages = $!post.getValue('images'))
1224 + #set($editFiles = $!post.getValue('files'))
1225 + <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
972 972   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集
973 973   </button>
974 974   #end
... ... @@ -976,6 +976,11 @@
976 976   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> 削除
977 977   </button>
978 978   #end
1233 + #if($showHideBtn)
1234 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1235 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
1236 + </button>
1237 + #end
979 979   </div>
980 980   #end
981 981   </div>
... ... @@ -1025,9 +1025,11 @@
1025 1025  
1026 1026   #if($xcontext.user != "XWiki.XWikiGuest")
1027 1027   <div class="thread-add-post">
1287 + #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1028 1028   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1029 1029   + 活動報告を追加
1030 1030   </a>
1291 + #end
1031 1031   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1032 1032   <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
1033 1033   </a>
... ... @@ -1194,37 +1194,130 @@
1194 1194  }
1195 1195  
1196 1196  // 投稿の編集(インライン編集フォームを開く)
1197 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1458 +function openEditPost(btn) {
1198 1198   var postEl = btn.closest('.thread-post');
1199 1199   if (!postEl) return;
1200 - // 既存の編集フォームがあれば閉じる
1201 1201   var existing = postEl.querySelector('.post-edit-form');
1202 1202   if (existing) { existing.remove(); return; }
1203 1203   var bodyEl = postEl.querySelector('.thread-post-body');
1204 1204   if (!bodyEl) return;
1465 +
1466 + var schoolPage = btn.getAttribute('data-school');
1467 + var postObjNum = btn.getAttribute('data-obj');
1468 + var currentContent = btn.getAttribute('data-content') || '';
1469 + var currentImages = btn.getAttribute('data-images') || '';
1470 + var currentFiles = btn.getAttribute('data-files') || '';
1471 + var postType = btn.getAttribute('data-post-type') || 'report';
1472 +
1205 1205   var form = document.createElement('div');
1206 1206   form.className = 'post-edit-form';
1207 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1208 - '<div class="post-edit-form-actions">' +
1475 + form.setAttribute('data-school', schoolPage);
1476 + form.setAttribute('data-obj', postObjNum);
1477 +
1478 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1479 +
1480 + // コメント以外は添付ファイル編集を表示
1481 + if (postType !== 'comment') {
1482 + // 既存画像
1483 + html += '<div class="edit-attachments">';
1484 + if (currentImages.trim()) {
1485 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1486 + var imgs = currentImages.trim().split('\n');
1487 + for (var i = 0; i < imgs.length; i++) {
1488 + var img = imgs[i].trim();
1489 + if (!img) continue;
1490 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1491 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1492 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1493 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1494 + '</div>';
1495 + }
1496 + html += '</div>';
1497 + }
1498 + // 既存ファイル
1499 + if (currentFiles.trim()) {
1500 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1501 + var files = currentFiles.trim().split('\n');
1502 + for (var j = 0; j < files.length; j++) {
1503 + var f = files[j].trim();
1504 + if (!f) continue;
1505 + var displayName = f;
1506 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1507 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1508 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1509 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1510 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1511 + '</div>';
1512 + }
1513 + html += '</div>';
1514 + }
1515 + // 新規追加
1516 + html += '<div class="edit-attach-add">' +
1517 + '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' +
1518 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1519 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1520 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' +
1521 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1522 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1523 + '</div>';
1524 + html += '</div>';
1525 + }
1526 +
1527 + html += '<div class="post-edit-form-actions">' +
1209 1209   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1210 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1529 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1211 1211   '</div>';
1531 +
1532 + form.innerHTML = html;
1212 1212   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1213 1213   form.querySelector('textarea').focus();
1214 1214  }
1215 1215  
1537 +function removeEditAttach(btn) {
1538 + var item = btn.closest('.edit-attach-item');
1539 + if (item) item.remove();
1540 +}
1541 +
1216 1216  // 投稿の編集を保存
1217 -function saveEditPost(schoolPage, postObjNum) {
1218 - var textarea = document.getElementById('editContent_' + postObjNum);
1543 +function saveEditPost(btn) {
1544 + var formEl = btn.closest('.post-edit-form');
1545 + if (!formEl) return;
1546 + var schoolPage = formEl.getAttribute('data-school');
1547 + var postObjNum = formEl.getAttribute('data-obj');
1548 + var textarea = formEl.querySelector('textarea');
1219 1219   if (!textarea) return;
1220 1220   var newContent = textarea.value.trim();
1221 1221   if (!newContent) { alert('投稿内容を入力してください'); return; }
1552 +
1222 1222   var csrfEl = document.querySelector('input[name="form_token"]');
1223 1223   var csrfToken = csrfEl ? csrfEl.value : '';
1555 +
1556 + var fd = new FormData();
1557 + fd.append('schoolPage', schoolPage);
1558 + fd.append('postObj', postObjNum);
1559 + fd.append('newContent', newContent);
1560 + fd.append('form_token', csrfToken);
1561 +
1562 + // 残す画像・ファイル
1563 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1564 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1565 +
1566 + // 新規画像
1567 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1568 + if (newImgInput && newImgInput.files) {
1569 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1570 + }
1571 + // 新規ファイル
1572 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1573 + if (newFileInput && newFileInput.files) {
1574 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1575 + }
1576 +
1577 + btn.disabled = true;
1578 + btn.textContent = '保存中...';
1579 +
1224 1224   var xhr = new XMLHttpRequest();
1225 1225   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1226 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1227 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1228 1228   xhr.onload = function() {
1229 1229   try {
1230 1230   var res = JSON.parse(xhr.responseText);
... ... @@ -1232,12 +1232,13 @@
1232 1232   showToast('投稿を更新しました', 'success');
1233 1233   setTimeout(function() { location.reload(); }, 800);
1234 1234   } else {
1589 + btn.disabled = false; btn.textContent = '保存';
1235 1235   alert('編集に失敗しました: ' + (res.error || ''));
1236 1236   }
1237 - } catch(e) { alert('編集に失敗しました'); }
1592 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1238 1238   };
1239 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1240 - xhr.send(editPostData);
1594 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1595 + xhr.send(fd);
1241 1241  }
1242 1242  
1243 1243  // 投稿の削除(確認ダイアログ付き)
... ... @@ -1261,6 +1261,80 @@
1261 1261   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1262 1262   xhr.send(deletePostData);
1263 1263  }
1619 +
1620 +/* --- 通報ダイアログ --- */
1621 +function openReportDialog(btn, targetPage, postObjNum, token) {
1622 + if (document.getElementById('report-dialog-overlay')) return;
1623 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1624 + var overlay = document.createElement('div');
1625 + overlay.id = 'report-dialog-overlay';
1626 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1627 + var dialog = document.createElement('div');
1628 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1629 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1630 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1631 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1632 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1633 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1634 + html += '</select>';
1635 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>';
1636 + html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1637 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1638 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1639 + html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1640 + html += '</div>';
1641 + dialog.innerHTML = html;
1642 + overlay.appendChild(dialog);
1643 + document.body.appendChild(overlay);
1644 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1645 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1646 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1647 + var reason = document.getElementById('report-reason').value;
1648 + var detail = document.getElementById('report-detail').value;
1649 + var submitBtn = document.getElementById('report-submit-btn');
1650 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1651 + var xhr = new XMLHttpRequest();
1652 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1653 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1654 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1655 + xhr.onload = function() {
1656 + overlay.remove();
1657 + showToast('通報を受け付けました', 'success');
1658 + setTimeout(function() { location.reload(); }, 1000);
1659 + };
1660 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1661 + xhr.send(data);
1662 + });
1663 +}
1664 +
1665 +/* --- 非表示ダイアログ(管理者用) --- */
1666 +function openHideDialog(btn, targetPage, postObjNum, token) {
1667 + if (document.getElementById('hide-dialog-overlay')) return;
1668 + var overlay = document.createElement('div');
1669 + overlay.id = 'hide-dialog-overlay';
1670 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1671 + var dialog = document.createElement('div');
1672 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1673 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1674 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1675 + html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1676 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1677 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1678 + html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1679 + html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1680 + html += '</div>';
1681 + dialog.innerHTML = html;
1682 + overlay.appendChild(dialog);
1683 + document.body.appendChild(overlay);
1684 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1685 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1686 + function doHide(action) {
1687 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1688 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1689 + }
1690 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1691 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1692 +}
1264 1264  </script>
1265 1265  {{/html}}
1266 1266  {{/velocity}}