Changes for page 学校ページ テンプレート

Summary

• Page properties (2 modified, 0 added, 0 removed)

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.XWikiGuest
	1	+XWiki.superadmin

Content

...	...	@@ -65,9 +65,7 @@
65	65	#set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66	66	#set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67	67
68		-## --- 年度アーカイブ ---
69		-#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70		-## 現在の年度を計算（4月始まり）
	68	+## --- 現在の年度を計算（4月始まり） ---
71	71	#set($nowFY = $datetool.date)
72	72	#set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
73	73	#set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
...	...	@@ -76,10 +76,6 @@
76	76	#else
77	77	#set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
78	78	#end
79		-## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80		-#if(!$pageFiscalYear || $pageFiscalYear == '')
81		- #set($pageFiscalYear = $currentFiscalYear.toString())
82		-#end
83	83
84	84	## --- 公開範囲フィールド ---
85	85	#set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
...	...	@@ -108,8 +108,12 @@
108	108
109	109	## --- 投稿固定/解除処理 ---
110	110	#set($pinAction = $!request.action)
111		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112		- #set($postObjNum = $mathtool.toInteger($!request.postObj))
	105	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	106	+ #set($pinPostObjStr = $!request.postObj)
	107	+ #if(!$pinPostObjStr.matches('^\d+$'))
	108	+ ## 不正な値 → 無視
	109	+ #else
	110	+ #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
113	113	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
114	114	#if($postObj)
115	115	#if($pinAction == 'pin')
...	...	@@ -129,12 +129,15 @@
129	129	$response.sendRedirect($doc.getURL('view'))
130	130	#stop
131	131	#end
	130	+ #end## /matches
132	132	#end
133	133
134	134	## --- 特色ある活動 選定/解除処理 ---
135	135	#set($featAction = $!request.action)
136		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137		- #set($actObjNum = $mathtool.toInteger($!request.actObj))
	135	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	136	+ #set($featActObjStr = $!request.actObj)
	137	+ #if($featActObjStr.matches('^\d+$'))
	138	+ #set($actObjNum = $mathtool.toInteger($featActObjStr))
138	138	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139	139	#if($actObj)
140	140	#if($featAction == 'feature')
...	...	@@ -166,6 +166,7 @@
166	166	$response.sendRedirect($doc.getURL('view'))
167	167	#stop
168	168	#end
	170	+ #end## /matches
169	169	#end
170	170
171	171	## --- ユーザー情報取得 ---
...	...	@@ -253,7 +253,7 @@
253	253	<tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
254	254	<tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
255	255	<tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
256		- <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
	258	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
257	257	<tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
258	258	</table>
259	259	#set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
...	...	@@ -311,7 +311,7 @@
311	311
312	312	## --- ③④⑤ 日常の活動・選挙・定例活動 ---
313	313	<div class="school-section-grid">
314		- #if($dailyActivities && $dailyActivities != '')
	316	+ #if($dailyActivities && !$dailyActivities.isEmpty())
315	315	<div class="school-section-card">
316	316	<h3><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>
317	317	<div class="card-inner">
...	...	@@ -318,7 +318,7 @@
318	318	<p class="activity-hint">活動時間の多い順に上位3つ</p>
319	319	<div class="tag-container">
320	320	#set($daIdx = 1)
321		- #foreach($da in $dailyActivities.split(","))
	323	+ #foreach($da in $dailyActivities)
322	322	<span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
323	323	#set($daIdx = $daIdx + 1)
324	324	#end
...	...	@@ -369,7 +369,7 @@
369	369	#end
370	370
371	371	## --- ⑦ 予算 ---
372		- #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	374	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
373	373	#if($hasBudget)
374	374	## 公開範囲チェック
375	375	#set($canViewBudget = true)
...	...	@@ -380,12 +380,12 @@
380	380	<div class="school-section-card">
381	381	<h3><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 == 'members')<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> 登録者限定#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>
382	382	<div class="card-inner">
383		- #if($budgetProcess && $budgetProcess != '')
	385	+ #if($budgetProcess && !$budgetProcess.isEmpty())
384	384	<div class="info-row">
385	385	<span class="info-label">作成過程の生徒関与</span>
386	386	<span class="info-value">
387	387	<div class="selection-display">
388		- #foreach($bp in $budgetProcess.split(","))
	390	+ #foreach($bp in $budgetProcess)
389	389	<span class="selection-item">$!escapetool.xml($bp.trim())</span>
390	390	#end
391	391	</div>
...	...	@@ -404,12 +404,12 @@
404	404	<span class="info-value">$!escapetool.xml($!budgetScale)</span>
405	405	</div>
406	406	#end
407		- #if($budgetAllocation && $budgetAllocation != '')
	409	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
408	408	<div class="info-row">
409	409	<span class="info-label">主な予算配分</span>
410	410	<span class="info-value">
411	411	<div class="selection-display">
412		- #foreach($ba in $budgetAllocation.split(","))
	414	+ #foreach($ba in $budgetAllocation)
413	413	<span class="selection-item">$!escapetool.xml($ba.trim())</span>
414	414	#end
415	415	</div>
...	...	@@ -442,12 +442,12 @@
442	442	<span class="info-label">見直しの有無（3年以内）</span>
443	443	<span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
444	444	</div>
445		- #if($ruleReviewContent && $ruleReviewContent != '')
	447	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
446	446	<div class="info-row">
447	447	<span class="info-label">見直しの内容</span>
448	448	<span class="info-value">
449	449	<div class="selection-display">
450		- #foreach($rc in $ruleReviewContent.split(","))
	452	+ #foreach($rc in $ruleReviewContent)
451	451	<span class="selection-item">$!escapetool.xml($rc.trim())</span>
452	452	#end
453	453	</div>
...	...	@@ -454,12 +454,12 @@
454	454	</span>
455	455	</div>
456	456	#end
457		- #if($ruleReviewProposer && $ruleReviewProposer != '')
	459	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
458	458	<div class="info-row">
459	459	<span class="info-label">見直しの提案者</span>
460	460	<span class="info-value">
461	461	<div class="selection-display">
462		- #foreach($rp in $ruleReviewProposer.split(","))
	464	+ #foreach($rp in $ruleReviewProposer)
463	463	<span class="selection-item">$!escapetool.xml($rp.trim())</span>
464	464	#end
465	465	</div>
...	...	@@ -466,12 +466,12 @@
466	466	</span>
467	467	</div>
468	468	#end
469		- #if($ruleReviewImplementer && $ruleReviewImplementer != '')
	471	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
470	470	<div class="info-row">
471	471	<span class="info-label">見直しの実施者</span>
472	472	<span class="info-value">
473	473	<div class="selection-display">
474		- #foreach($ri in $ruleReviewImplementer.split(","))
	476	+ #foreach($ri in $ruleReviewImplementer)
475	475	<span class="selection-item">$!escapetool.xml($ri.trim())</span>
476	476	#end
477	477	</div>
...	...	@@ -947,59 +947,6 @@
947	947	{{/html}}
948	948	#end
949	949
950		-## --- 年度アーカイブ セクション ---
951		-{{html clean="false"}}
952		-<div class="school-section-card school-archive-card">
953		- <h2 class="archive-section-title">
954		- <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
955		- 年度アーカイブ
956		- </h2>
957		- <div class="archive-meta">
958		- 現在のページ: <strong>${pageFiscalYear}年度</strong>
959		- #set($lyud = $!doc.getValue('lastYearUpdateDate'))
960		- #if($lyud && $lyud != '')
961		- | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
962		- #end
963		- </div>
964		-
965		- ## 過去アーカイブの検索
966		- #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
967		- #set($archivePages = $archiveQuery.execute())
968		-
969		- #if($archivePages && $archivePages.size() > 0)
970		- <div class="archive-card-field-lg">
971		- <div class="archive-list-label">過去の年度アーカイブ</div>
972		- <div class="archive-list">
973		- #foreach($archPage in $archivePages)
974		- #set($archPageDoc = $xwiki.getDocument($archPage))
975		- #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
976		- #if($archPageObj)
977		- #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
978		- <a href="$archPageDoc.getURL('view')" class="archive-link">
979		- <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
980		- ${archPageFY}年度
981		- </a>
982		- #end
983		- #end
984		- </div>
985		- </div>
986		- #else
987		- <div class="archive-empty">過去のアーカイブはまだありません</div>
988		- #end
989		-
990		- ## 新年度に移行ボタン（承認済み・管理者のみ）
991		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
992		- <div class="archive-action">
993		- <a href="/bin/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
994		- <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
995		- ${pageFiscalYear}年度をアーカイブして新年度に移行
996		- </a>
997		- <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
998		- </div>
999		- #end
1000		-</div>
1001		-{{/html}}
1002		-
1003	1003	## --- 年度タブ切り替え JavaScript ---
1004	1004	{{html clean="false"}}
1005	1005	<script>
...	...	@@ -1022,9 +1022,6 @@
1022	1022	var defaultTab = document.querySelector('.activity-fy-tab.active');
1023	1023	if (defaultTab) { defaultTab.click(); }
1024	1024	// 保存成功時のトースト通知
1025		- if (window.location.search.indexOf('archived=1') !== -1) {
1026		- showToast('年度アーカイブを作成しました', 'success');
1027		- }
1028	1028	if (window.location.search.indexOf('saved=1') !== -1) {
1029	1029	showToast('学校情報を保存しました', 'success');
1030	1030	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -1091,7 +1091,9 @@
1091	1091	var csrfEl = document.querySelector('input[name="form_token"]');
1092	1092	var csrfToken = csrfEl ? csrfEl.value : '';
1093	1093	var xhr = new XMLHttpRequest();
1094		- xhr.open('GET', '/bin/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
	1040	+ xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
	1041	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1042	+ var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1095	1095	xhr.onload = function() {
1096	1096	try {
1097	1097	var res = JSON.parse(xhr.responseText);
...	...	@@ -1104,7 +1104,7 @@
1104	1104	} catch(e) { alert('編集に失敗しました'); }
1105	1105	};
1106	1106	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1107		- xhr.send();
	1055	+ xhr.send(editPostData);
1108	1108	}
1109	1109
1110	1110	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1111,7 +1111,9 @@
1111	1111	function confirmDeletePost(schoolPage, postObjNum, token) {
1112	1112	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1113	1113	var xhr = new XMLHttpRequest();
1114		- xhr.open('GET', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
	1062	+ xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1063	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1064	+ var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1115	1115	xhr.onload = function() {
1116	1116	try {
1117	1117	var res = JSON.parse(xhr.responseText);
...	...	@@ -1124,7 +1124,7 @@
1124	1124	} catch(e) { alert('削除に失敗しました'); }
1125	1125	};
1126	1126	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1127		- xhr.send();
	1077	+ xhr.send(deletePostData);
1128	1128	}
1129	1129	</script>
1130	1130	{{/html}}