Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
98.1 
98.1
edited by Super Admin
on 2026/03/20 18:16
on 2026/03/20 18:16
Change comment:
There is no comment for this version
To version 107.1
107.1
edited by Super Admin
on 2026/03/24 15:28
on 2026/03/24 15:28
Change comment:
There is no comment for this version
Summary
Details
-
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> ... ... @@ -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>'; 1581 + var iconSvg = icons[type] || ''; 1582 + if (iconSvg) { 1583 + var iconSpan = document.createElement('span'); 1584 + iconSpan.innerHTML = iconSvg; 1585 + toast.appendChild(iconSpan); 1586 + } 1587 + var msgSpan = document.createElement('span'); 1588 + msgSpan.textContent = message; 1589 + 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,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1578 1578 1579 1579 // コメント以外は添付ファイル編集を表示 1628 + function escAttr(s) { return s.replace(/&/g,'&').replace(/"/g,'"').replace(/'/g,''').replace(/</g,'<').replace(/>/g,'>'); } 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,'"') + '">' +1638 + 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,'"') + '" />' +1641 + '<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,'"') + '">' +1607 - '<span class="edit-attach-fname">' + displayName .replace(/</g,'<').replace(/>/g,'>')+ '</span>' +1655 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' + 1656 + '<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,'"') + '" />' +1658 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' + 1610 1610 '</div>'; 1611 1611 } 1612 1612 html += '</div>';