Merge branch 'master' of https://gitea.softopia.gku.ac.jp/kitagata/kitagata

.idea/workspace.xml

@@ -25,9 +25,9 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12950] HP更新依頼(先端設備等導入計画）">
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-12912] HP更新依頼（北方町議会　日程）">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/parliament/Session_schedule_r3.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/parliament/Session_schedule_r3.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/third/living/The_subsidy_program_for_seismic_diagnosis_seismic_strengthening.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/living/The_subsidy_program_for_seismic_diagnosis_seismic_strengthening.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -44,7 +44,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="faeture/12931-water_supply_sewer-test" />
+        <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -196,21 +196,9 @@
       <workItem from="1625130991516" duration="1264000" />
       <workItem from="1625189367399" duration="1799000" />
       <workItem from="1625191783912" duration="4393000" />
-      <workItem from="1625208024248" duration="1322000" />
-    </task>
-    <task id="LOCAL-00054" summary="[kitagata_support-12632] ホームページ更新依頼（町の人口）">
-      <created>1620879123491</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1620879123491</updated>
-    </task>
-    <task id="LOCAL-00055" summary="[kitagata_support-12633] 【HP更新依頼】令和3年度予算概要">
-      <created>1620893332045</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1620893332045</updated>
+      <workItem from="1625208024248" duration="1464000" />
+      <workItem from="1625209723412" duration="1514000" />
+      <workItem from="1625448704268" duration="1341000" />
     </task>
     <task id="LOCAL-00056" summary="[kitagata_support-12633] 【HP更新依頼】令和3年度予算概要 一部修正">
       <created>1620953794221</created>
@@ -541,7 +529,21 @@
       <option name="project" value="LOCAL" />
       <updated>1625208937955</updated>
     </task>
-    <option name="localTasksCounter" value="103" />
+    <task id="LOCAL-00103" summary="[kitagata_support-12912] HP更新依頼（北方町議会　日程）">
+      <created>1625209419771</created>
+      <option name="number" value="00103" />
+      <option name="presentableId" value="LOCAL-00103" />
+      <option name="project" value="LOCAL" />
+      <updated>1625209419772</updated>
+    </task>
+    <task id="LOCAL-00104" summary="[kitagata_support-12912] HP更新依頼（北方町議会　日程）">
+      <created>1625449302526</created>
+      <option name="number" value="00104" />
+      <option name="presentableId" value="LOCAL-00104" />
+      <option name="project" value="LOCAL" />
+      <updated>1625449302526</updated>
+    </task>
+    <option name="localTasksCounter" value="105" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -588,7 +590,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="[kitagata_support-12831] HP更新依頼（北方町議会＞請願陳情）" />
     <MESSAGE value="[kitagata_support-12840] ＨＰ更新依頼（コロナワクチン）" />
     <MESSAGE value="[kitagata_support-12841] Re- HP更新依頼【都市環境課】都市計画様式の差し替え(改改)" />
     <MESSAGE value="[kitagata_support-12842] HP更新依頼【都市環境課】生け垣づくり推奨補助金" />
@@ -613,7 +614,8 @@
     <MESSAGE value="[kitagata_support-12961] HP更新依頼（方針と重点）" />
     <MESSAGE value="[kitagata_support-12934] HP修正依頼（がん患者医療用補正具購入費助成事業）" />
     <MESSAGE value="[kitagata_support-12950] HP更新依頼(先端設備等導入計画）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-12950] HP更新依頼(先端設備等導入計画）" />
+    <MESSAGE value="[kitagata_support-12912] HP更新依頼（北方町議会　日程）" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-12912] HP更新依頼（北方町議会　日程）" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/kitagata$.dat" NAME="更新用 Coverage Results" MODIFIED="1569418362637" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="WipCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />

third/living/The_subsidy_program_for_seismic_diagnosis_seismic_strengthening.html

@@ -252,15 +252,15 @@
 								</tr>
 								<tr>
 									<th valign="top" rowspan="3" bgcolor="#add8e6">一戸建て住宅以外</th>
-									<td valign="top" align="right" bgcolor="#dcdcdc">
-
+									<td valign="top" style="text-align: right" bgcolor="#dcdcdc">
+1棟当たり　<br>1,570,000円<br/>
+										ただし、床面積<br>1,000m&sup2;以内の部分<br>は
+										3,670円/m&sup2;以内、<br/>
+										1,000m&sup2;～<br>2,000m&sup2;未満の部分<br>は1,570円/m&sup2;以内、<br/>
+										2,000m&sup2;～の部分は<br>1,050円/m&sup2;以内
 									</td>
 									<td valign="top" style="text-align:right" bgcolor="#dcdcdc">2/3 <br>
-																			1棟当たり　1,570,000円<br/>
-										ただし、床面積1,000m&sup2;以内の部分は
-										3,670円/m&sup2;以内、<br/>
-										1,000m&sup2;～2,000m&sup2;未満の部分は1,570円/m&sup2;以内、<br/>
-										2,000m&sup2;～の部分は1,050円/m&sup2;以内
+
 									</td>
 									<td valign="top" style="text-align:right" bgcolor="#dcdcdc">
 										1棟当たり　1,046,000円<br/>