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

.idea/workspace.xml

@@ -25,14 +25,8 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13014] Re- HP更新依頼【削除依頼】（小規模事業者持続化補助金）">
-      <change afterPath="$PROJECT_DIR$/css/pdf/childrens_museum/2021_07_childrens_museum_N_O.doc" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/childrens_museum/2021_07_childrens_museum_N_U.doc" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/childrens_museum/2021_07_childrens_museum_S_O.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/css/pdf/childrens_museum/2021_07_childrens_museum_S_U.docx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Northern_north_childrens_museum.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Northern_north_childrens_museum.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fourth/living/Northern_south_childrens_museum.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Northern_south_childrens_museum.html" afterDir="false" />
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13018] ＨＰ更新依頼（上下水指定店）">
+      <change beforePath="$PROJECT_DIR$/second/Condolence.html" beforeDir="false" afterPath="$PROJECT_DIR$/second/Condolence.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -102,11 +96,11 @@
       <recent name="$PROJECT_DIR$/third/Public_transport" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
       <recent name="$PROJECT_DIR$/css/pdf/childrens_museum" />
       <recent name="$PROJECT_DIR$/css/pdf" />
       <recent name="$PROJECT_DIR$/fourth/notices" />
       <recent name="$PROJECT_DIR$/fourth/lifeguide/health/pdf" />
-      <recent name="$PROJECT_DIR$/second" />
     </key>
   </component>
   <component name="RunManager">
@@ -205,21 +199,7 @@
       <workItem from="1625209723412" duration="1514000" />
       <workItem from="1625448704268" duration="1341000" />
       <workItem from="1625473511168" duration="862000" />
-      <workItem from="1625717127291" duration="1458000" />
-    </task>
-    <task id="LOCAL-00061" summary="[kitagata_support-12676] HP更新依頼（図書館削除・追加）">
-      <created>1621303459968</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1621303459969</updated>
-    </task>
-    <task id="LOCAL-00062" summary="[kitagata_support-12698] Re- HP更新依頼（教育委員会求人）">
-      <created>1621475094291</created>
-      <option name="number" value="00062" />
-      <option name="presentableId" value="LOCAL-00062" />
-      <option name="project" value="LOCAL" />
-      <updated>1621475094292</updated>
+      <workItem from="1625717127291" duration="2734000" />
     </task>
     <task id="LOCAL-00063" summary="[kitagata_support-12701] 北方町ＨＰ更新依頼　住民監査請求">
       <created>1621737123498</created>
@@ -550,7 +530,21 @@
       <option name="project" value="LOCAL" />
       <updated>1625717753329</updated>
     </task>
-    <option name="localTasksCounter" value="110" />
+    <task id="LOCAL-00110" summary="[kitagata_support-13016] HP更新依頼（子ども館お便り）">
+      <created>1625718617453</created>
+      <option name="number" value="00110" />
+      <option name="presentableId" value="LOCAL-00110" />
+      <option name="project" value="LOCAL" />
+      <updated>1625718617453</updated>
+    </task>
+    <task id="LOCAL-00111" summary="[kitagata_support-13018] ＨＰ更新依頼（上下水指定店）">
+      <created>1625719735956</created>
+      <option name="number" value="00111" />
+      <option name="presentableId" value="LOCAL-00111" />
+      <option name="project" value="LOCAL" />
+      <updated>1625719735956</updated>
+    </task>
+    <option name="localTasksCounter" value="112" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -597,8 +591,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="[kitagata_support-12893] HP更新依頼（物品調達方針）" />
-    <MESSAGE value="[kitagata_support-12899] HP更新依頼(アユカ一般）" />
     <MESSAGE value="[kitagata_support-12900] ＨＰ更新依頼（6月23日ごろまでにお願い致します）" />
     <MESSAGE value="[kitagata_support-12901] 【HP更新依頼】定住奨励金事業" />
     <MESSAGE value="[kitagata_support-12903] HP更新依頼【都市環境課】イベント中止情報" />
@@ -622,7 +614,9 @@
     <MESSAGE value="[kitagata_support-13010] HP更新依頼（プレミアム商品券取扱店募集）" />
     <MESSAGE value="[WIP]　12931 ファイルを一部追加" />
     <MESSAGE value="[kitagata_support-13014] Re- HP更新依頼【削除依頼】（小規模事業者持続化補助金）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13014] Re- HP更新依頼【削除依頼】（小規模事業者持続化補助金）" />
+    <MESSAGE value="[kitagata_support-13016] HP更新依頼（子ども館お便り）" />
+    <MESSAGE value="[kitagata_support-13018] ＨＰ更新依頼（上下水指定店）" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13018] ＨＰ更新依頼（上下水指定店）" />
   </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" />

fourth/living/Kitagata_Water_Plumbing_business_roster.html

@@ -141,9 +141,9 @@
           </div>
           <span id="template_article_block">
             <p class="paragraphT10">令和2年10月1日現在の名簿です。</p>
-            <a href="../lifeguide/water/pdf/shitei_koujisha_20210421.xls" target="_blank">指定給水装置工事事業者及び下水道工事指定店(Excel
+            <a href="../lifeguide/water/pdf/shitei_koujisha_20210630.xls" target="_blank">指定給水装置工事事業者及び下水道工事指定店(Excel
               105KB)</a><br />
-            <a href="../lifeguide/water/pdf/shitei_koujisha_20210421.pdf" target="_blank">指定給水装置工事事業者及び下水道工事指定店(PDF
+            <a href="../lifeguide/water/pdf/shitei_koujisha_20210630.pdf" target="_blank">指定給水装置工事事業者及び下水道工事指定店(PDF
               248KB)</a>
           </span>
         </article>

fourth/living/Sewer_construction_work_specified_store_roster.html

@@ -142,9 +142,9 @@
           </div>
           <span id="template_article_block">
             <p class="paragraphT10">令和2年10月1日現在の名簿です。</p>
-            <a href="../lifeguide/water/pdf/shitei_koujisha_20210421.xls" target="_blank">指定給水装置工事事業者及び下水道工事指定店(Excel
+            <a href="../lifeguide/water/pdf/shitei_koujisha_20210630.xls" target="_blank">指定給水装置工事事業者及び下水道工事指定店(Excel
               105KB)</a><br />
-            <a href="../lifeguide/water/pdf/shitei_koujisha_20210421.pdf" target="_blank">指定給水装置工事事業者及び下水道工事指定店(PDF
+            <a href="../lifeguide/water/pdf/shitei_koujisha_20210630.pdf" target="_blank">指定給水装置工事事業者及び下水道工事指定店(PDF
               248KB)</a>
           </span>
         </article>

second/Condolence.html

@@ -153,13 +153,13 @@ new google.translate.TranslateElement({pageLanguage: 'ja', layout: google.transl
                             	ご家族がお亡くなりになった時に関わる手続き</a></span><br />
                         				    	<span class="clear"></span>
           						</div>
-          						<div class="template_list">
-								<span class="template_list">
-              							<span class="template_list_img left"><img src="../css/img/smallbutton_secondfloor.png" /></span>
-                            	<a href="../fourth/topics/pdf/11003.pdf">
-                            	犬の死亡届出書（PDF 45KB)</a></span><br />
-                        				    	<span class="clear"></span>
-          						</div>
+<!--          						<div class="template_list">-->
+<!--								<span class="template_list">-->
+<!--              							<span class="template_list_img left"><img src="../css/img/smallbutton_secondfloor.png" /></span>-->
+<!--                            	<a href="../fourth/topics/pdf/11003.pdf">-->
+<!--                            	犬の死亡届出書（PDF 45KB)</a></span><br />-->
+<!--                        				    	<span class="clear"></span>-->
+<!--          						</div>-->
 						</div>
 						<div class="right">
           						<div class="template_list">