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

From version Icon 97.1 Icon
edited by Super Admin
on 2026/03/20 18:10
Change comment: There is no comment for this version
To version Icon 108.1 Icon
edited by Super Admin
on 2026/03/24 17:20
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -68,6 +68,7 @@
68 68  #set($activityPlace = $doc.getValue('activityPlace'))
69 69  #set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 70  #set($activityRoomImage = $doc.getValue('activityRoomImage'))
71 +#set($ictTools = $doc.getValue('ictTools'))
71 71  #set($ictUsage = $doc.getValue('ictUsage'))
72 72  
73 73  ## --- 生徒総会 ---
... ... @@ -144,6 +144,7 @@
144 144  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
145 145  #set($isViewerAdmin = false)
146 146  #set($viewerSchoolCode = '')
148 +#set($viewerSecondaryGraduated = false)
147 147  #if(!$isGuest)
148 148   #set($viewerDoc = $xwiki.getDocument($viewerUser))
149 149   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -153,6 +153,24 @@
153 153   #if($viewerAccountType == 'admin')
154 154   #set($isViewerAdmin = true)
155 155   #end
158 + ## 第2所属校の在学年数超過チェック
159 + #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
160 + #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
161 + #set($vNow = $datetool.date)
162 + #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
163 + #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
164 + #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
165 + #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
166 + #set($vSecMax = 3)
167 + #if($viewerSecondarySchoolCode.length() >= 2)
168 + #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
169 + #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
170 + #end
171 + #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
172 + #if($vSecGrade > $vSecMax)
173 + #set($viewerSecondaryGraduated = true)
174 + #end
175 + #end
156 156  #end
157 157  
158 158  ## --- 関連校(中高一貫校)情報 ---
... ... @@ -162,7 +162,7 @@
162 162  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
163 163   #if($viewerSchoolCode == $affiliatedSchoolCode)
164 164   #set($isAffiliated = true)
165 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
185 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
166 166   #set($isAffiliated = true)
167 167   #end
168 168  #end
... ... @@ -172,7 +172,7 @@
172 172  #if(!$isGuest && $viewerUserRole != 'graduate')
173 173   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
174 174   #set($isSchoolMember = true)
175 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
195 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
176 176   #set($isSchoolMember = true)
177 177   #end
178 178  #end
... ... @@ -376,6 +376,27 @@
376 376  </div>
377 377  #end
378 378  
399 +## --- 未入力ガイド(自校ユーザー向け) ---
400 +#if(!$isGuest && $canEdit)
401 + #set($missingItems = [])
402 + #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end
403 + #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end
404 + #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end
405 + #if(!$ruleReviewStatus || $ruleReviewStatus == '') #set($discard = $missingItems.add('校則・生徒会会則の見直し')) #end
406 + #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
407 + #if($activityCount == 0) #set($discard = $missingItems.add('活動報告(まだ投稿がありません)')) #end
408 + #if($missingItems.size() > 0)
409 +<div class="form-message-info" style="margin-bottom:var(--sp-4);">
410 + <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。
411 + <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);">
412 + #foreach($item in $missingItems)
413 + <li>$item</li>
414 + #end
415 + </ul>
416 +</div>
417 + #end
418 +#end
419 +
379 379  ## --- ① 学校基本情報 ---
380 380  <div class="school-info-card collapsed" id="card-basic-info">
381 381   <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>
... ... @@ -640,7 +640,7 @@
640 640   #end
641 641  
642 642   ## --- 活動環境 ---
643 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
684 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
644 644   #if($hasActivityEnv)
645 645   #set($canViewAE = true)
646 646   #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
... ... @@ -674,6 +674,40 @@
674 674   <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
675 675   </div>
676 676   #end
718 + #if($ictTools && !$ictTools.isEmpty())
719 + <div class="info-row">
720 + <span class="info-label">利用しているICTツール</span>
721 + <span class="info-value">
722 + #set($ictCatDisplay = [
723 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他(連絡)"]],
724 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他(ドキュメント)"]],
725 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他(タスク管理)"]],
726 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他(ビデオ会議)"]],
727 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他(アンケート)"]],
728 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他(デザイン)"]],
729 + ["その他", ["独自のWebシステム・自作アプリ"]]
730 + ])
731 + #foreach($catD in $ictCatDisplay)
732 + #set($catHasItems = false)
733 + #foreach($t in $catD.get(1))
734 + #if($ictTools.contains($t)) #set($catHasItems = true) #end
735 + #end
736 + #if($catHasItems)
737 + <div style="margin-bottom:6px">
738 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
739 + <div class="selection-display" style="margin-top:2px">
740 + #foreach($t in $catD.get(1))
741 + #if($ictTools.contains($t))
742 + <span class="selection-item">$!escapetool.xml($t)</span>
743 + #end
744 + #end
745 + </div>
746 + </div>
747 + #end
748 + #end
749 + </span>
750 + </div>
751 + #end
677 677   #if($ictUsage && !$ictUsage.isEmpty())
678 678   <div class="info-row">
679 679   <span class="info-label">ICT活用している場面</span>
... ... @@ -1262,6 +1262,25 @@
1262 1262   #if($postVis != 'public')
1263 1263   <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>
1264 1264   #end
1340 + ## いいねボタン
1341 + #set($postLikeCount = $!post.getValue('likeCount'))
1342 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
1343 + #set($postLikedBy = $!post.getValue('likedBy'))
1344 + #set($isLikedByMe = false)
1345 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
1346 + <div class="post-like-row post-action-mt">
1347 + #if($xcontext.user != 'XWiki.XWikiGuest')
1348 + <button type="button" class="btn-like #if($isLikedByMe)liked#end" data-page="$escapetool.xml($doc.fullName)" data-obj="$post.number" data-csrf="$services.csrf.getToken()" onclick="toggleLike(this)">
1349 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24" #if($isLikedByMe)fill="currentColor" stroke="none"#end><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1350 + <span class="like-count">$postLikeCount</span>
1351 + </button>
1352 + #else
1353 + <span class="btn-like disabled">
1354 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1355 + <span class="like-count">$postLikeCount</span>
1356 + </span>
1357 + #end
1358 + </div>
1265 1265   ## 固定/編集/削除/通報/非表示ボタン(横並び)
1266 1266   #set($postAuthorRef = $!post.getValue('authorRef'))
1267 1267   #set($postObjNumED = $post.number)
... ... @@ -1382,10 +1382,68 @@
1382 1382  {{/html}}
1383 1383  #end
1384 1384  
1479 +## --- OGP / SNSシェア対応 ---
1480 +#set($ogpTitle = "${schoolName} — 生徒会Wiki")
1481 +#set($ogpDesc = "${schoolName}の生徒会活動情報。")
1482 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
1483 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
1484 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
1485 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
1486 +
1385 1385  ## --- 年度タブ切り替え JavaScript ---
1386 1386  {{html clean="false"}}
1387 1387  <script>
1490 +// OGPメタタグ挿入
1491 +(function() {
1492 + var ogp = {
1493 + 'og:title': '$escapetool.javascript($ogpTitle)',
1494 + 'og:description': '$escapetool.javascript($ogpDesc)',
1495 + 'og:type': 'article',
1496 + 'og:url': '$escapetool.javascript($ogpUrl)',
1497 + 'og:site_name': '生徒会Wiki',
1498 + 'twitter:card': 'summary'
1499 + };
1500 + for (var p in ogp) {
1501 + var meta = document.createElement('meta');
1502 + meta.setAttribute('property', p);
1503 + meta.setAttribute('content', ogp[p]);
1504 + document.head.appendChild(meta);
1505 + }
1506 + // twitter用
1507 + var tw = document.createElement('meta');
1508 + tw.setAttribute('name', 'twitter:card');
1509 + tw.setAttribute('content', 'summary');
1510 + document.head.appendChild(tw);
1511 +})();
1388 1388  // コンパクト表示(タイトルのみ)トグル
1513 +// いいねトグル
1514 +function toggleLike(btn) {
1515 + var page = btn.getAttribute('data-page');
1516 + var obj = btn.getAttribute('data-obj');
1517 + var csrf = btn.getAttribute('data-csrf');
1518 + btn.disabled = true;
1519 + var fd = new FormData();
1520 + fd.append('page', page);
1521 + fd.append('obj', obj);
1522 + fd.append('form_token', csrf);
1523 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
1524 + .then(function(r) { return r.json(); })
1525 + .then(function(data) {
1526 + btn.querySelector('.like-count').textContent = data.count;
1527 + if (data.action === 'liked') {
1528 + btn.classList.add('liked');
1529 + btn.querySelector('svg').setAttribute('fill', 'currentColor');
1530 + btn.querySelector('svg').setAttribute('stroke', 'none');
1531 + } else {
1532 + btn.classList.remove('liked');
1533 + btn.querySelector('svg').removeAttribute('fill');
1534 + btn.querySelector('svg').setAttribute('stroke', 'currentColor');
1535 + }
1536 + })
1537 + .catch(function() { alert('エラーが発生しました'); })
1538 + .finally(function() { btn.disabled = false; });
1539 +}
1540 +
1389 1389  function toggleCompactView() {
1390 1390   var container = document.querySelector('.xwiki-content') || document.body;
1391 1391   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1503,7 +1503,15 @@
1503 1503   };
1504 1504   var toast = document.createElement('div');
1505 1505   toast.className = 'toast toast-' + type;
1506 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1658 + var iconSvg = icons[type] || '';
1659 + if (iconSvg) {
1660 + var iconSpan = document.createElement('span');
1661 + iconSpan.innerHTML = iconSvg;
1662 + toast.appendChild(iconSpan);
1663 + }
1664 + var msgSpan = document.createElement('span');
1665 + msgSpan.textContent = message;
1666 + toast.appendChild(msgSpan);
1507 1507   container.appendChild(toast);
1508 1508   setTimeout(function() { toast.remove(); }, 3200);
1509 1509  }
... ... @@ -1542,6 +1542,7 @@
1542 1542   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1543 1543  
1544 1544   // コメント以外は添付ファイル編集を表示
1705 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1545 1545   if (postType !== 'comment') {
1546 1546   // 既存画像
1547 1547   html += '<div class="edit-attachments">';
... ... @@ -1551,10 +1551,10 @@
1551 1551   for (var i = 0; i < imgs.length; i++) {
1552 1552   var img = imgs[i].trim();
1553 1553   if (!img) continue;
1554 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1715 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1555 1555   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1556 1556   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1557 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1718 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1558 1558   '</div>';
1559 1559   }
1560 1560   html += '</div>';
... ... @@ -1568,10 +1568,10 @@
1568 1568   if (!f) continue;
1569 1569   var displayName = f;
1570 1570   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1571 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1572 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1732 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1733 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1573 1573   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1574 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1735 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1575 1575   '</div>';
1576 1576   }
1577 1577   html += '</div>';