Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From 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
To 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
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -145,7 +145,6 @@ 145 145 #set($isGuest = $viewerUser == 'XWiki.XWikiGuest') 146 146 #set($isViewerAdmin = false) 147 147 #set($viewerSchoolCode = '') 148 -#set($viewerSecondaryGraduated = false) 149 149 #if(!$isGuest) 150 150 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 151 151 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) ... ... @@ -155,24 +155,6 @@ 155 155 #if($viewerAccountType == 'admin') 156 156 #set($isViewerAdmin = true) 157 157 #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 176 176 #end 177 177 178 178 ## --- 関連校（中高一貫校）情報 --- ... ... @@ -182,7 +182,7 @@ 182 182 #if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 183 183 #if($viewerSchoolCode == $affiliatedSchoolCode) 184 184 #set($isAffiliated = true) 185 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)166 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 186 186 #set($isAffiliated = true) 187 187 #end 188 188 #end ... ... @@ -192,7 +192,7 @@ 192 192 #if(!$isGuest && $viewerUserRole != 'graduate') 193 193 #if($viewerSchoolCode == $schoolCode || $isAffiliated) 194 194 #set($isSchoolMember = true) 195 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)176 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 196 196 #set($isSchoolMember = true) 197 197 #end 198 198 #end ... ... @@ -396,27 +396,6 @@ 396 396 </div> 397 397 #end 398 398 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 - 420 420 ## --- ① 学校基本情報 --- 421 421 <div class="school-info-card collapsed" id="card-basic-info"> 422 422 <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> ... ... @@ -1578,15 +1578,7 @@ 1578 1578 }; 1579 1579 var toast = document.createElement('div'); 1580 1580 toast.className = 'toast toast-' + type; 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); 1541 + toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>'; 1590 1590 container.appendChild(toast); 1591 1591 setTimeout(function() { toast.remove(); }, 3200); 1592 1592 } ... ... @@ -1625,7 +1625,6 @@ 1625 1625 var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1626 1626 1627 1627 // コメント以外は添付ファイル編集を表示 1628 - function escAttr(s) { return s.replace(/&/g,'&').replace(/"/g,'"').replace(/'/g,''').replace(/</g,'<').replace(/>/g,'>'); } 1629 1629 if (postType !== 'comment') { 1630 1630 // 既存画像 1631 1631 html += '<div class="edit-attachments">'; ... ... @@ -1635,10 +1635,10 @@ 1635 1635 for (var i = 0; i < imgs.length; i++) { 1636 1636 var img = imgs[i].trim(); 1637 1637 if (!img) continue; 1638 - html += '<div class="edit-attach-item" data-name="' + e scAttr(img) + '">' +1589 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1639 1639 '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1640 1640 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1641 - '<input type="hidden" name="keepImages" value="' + e scAttr(img) + '" />' +1592 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1642 1642 '</div>'; 1643 1643 } 1644 1644 html += '</div>'; ... ... @@ -1652,10 +1652,10 @@ 1652 1652 if (!f) continue; 1653 1653 var displayName = f; 1654 1654 if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1655 - html += '<div class="edit-attach-item" data-name="' + e scAttr(f) + '">' +1656 - '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +1606 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1607 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1657 1657 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1658 - '<input type="hidden" name="keepFiles" value="' + e scAttr(f) + '" />' +1609 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1659 1659 '</div>'; 1660 1660 } 1661 1661 html += '</div>';