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

From version Icon 98.1 Icon
edited by Super Admin
on 2026/03/20 18:16
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
... ... @@ -145,6 +145,7 @@
145 145  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
146 146  #set($isViewerAdmin = false)
147 147  #set($viewerSchoolCode = '')
148 +#set($viewerSecondaryGraduated = false)
148 148  #if(!$isGuest)
149 149   #set($viewerDoc = $xwiki.getDocument($viewerUser))
150 150   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -154,6 +154,24 @@
154 154   #if($viewerAccountType == 'admin')
155 155   #set($isViewerAdmin = true)
156 156   #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
157 157  #end
158 158  
159 159  ## --- 関連校(中高一貫校)情報 ---
... ... @@ -163,7 +163,7 @@
163 163  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
164 164   #if($viewerSchoolCode == $affiliatedSchoolCode)
165 165   #set($isAffiliated = true)
166 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
185 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
167 167   #set($isAffiliated = true)
168 168   #end
169 169  #end
... ... @@ -173,7 +173,7 @@
173 173  #if(!$isGuest && $viewerUserRole != 'graduate')
174 174   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
175 175   #set($isSchoolMember = true)
176 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
195 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
177 177   #set($isSchoolMember = true)
178 178   #end
179 179  #end
... ... @@ -377,6 +377,27 @@
377 377  </div>
378 378  #end
379 379  
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 +
380 380  ## --- ① 学校基本情報 ---
381 381  <div class="school-info-card collapsed" id="card-basic-info">
382 382   <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>
... ... @@ -1297,6 +1297,25 @@
1297 1297   #if($postVis != 'public')
1298 1298   <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>
1299 1299   #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>
1300 1300   ## 固定/編集/削除/通報/非表示ボタン(横並び)
1301 1301   #set($postAuthorRef = $!post.getValue('authorRef'))
1302 1302   #set($postObjNumED = $post.number)
... ... @@ -1417,10 +1417,68 @@
1417 1417  {{/html}}
1418 1418  #end
1419 1419  
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 +
1420 1420  ## --- 年度タブ切り替え JavaScript ---
1421 1421  {{html clean="false"}}
1422 1422  <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 +})();
1423 1423  // コンパクト表示(タイトルのみ)トグル
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 +
1424 1424  function toggleCompactView() {
1425 1425   var container = document.querySelector('.xwiki-content') || document.body;
1426 1426   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1538,7 +1538,15 @@
1538 1538   };
1539 1539   var toast = document.createElement('div');
1540 1540   toast.className = 'toast toast-' + type;
1541 - 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);
1542 1542   container.appendChild(toast);
1543 1543   setTimeout(function() { toast.remove(); }, 3200);
1544 1544  }
... ... @@ -1577,6 +1577,7 @@
1577 1577   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1578 1578  
1579 1579   // コメント以外は添付ファイル編集を表示
1705 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1580 1580   if (postType !== 'comment') {
1581 1581   // 既存画像
1582 1582   html += '<div class="edit-attachments">';
... ... @@ -1586,10 +1586,10 @@
1586 1586   for (var i = 0; i < imgs.length; i++) {
1587 1587   var img = imgs[i].trim();
1588 1588   if (!img) continue;
1589 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1715 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1590 1590   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1591 1591   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1592 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1718 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1593 1593   '</div>';
1594 1594   }
1595 1595   html += '</div>';
... ... @@ -1603,10 +1603,10 @@
1603 1603   if (!f) continue;
1604 1604   var displayName = f;
1605 1605   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1606 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1607 - '<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>' +
1608 1608   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1609 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1735 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1610 1610   '</div>';
1611 1611   }
1612 1612   html += '</div>';