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

.idea/workspace.xml

@@ -25,17 +25,10 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13090] 再送：ホームページ更新依頼（国保税）">
-      <change afterPath="$PROJECT_DIR$/third/notices/297_20210802.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/notices/297_20210802_1.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/notices/297_20210802_2.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/notices/297_20210802_3.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/notices/297_20210802_4.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/notices/297_20210802_5.pdf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/third/notices/297_20210802_img.pdf" afterDir="false" />
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13092] HP更新依頼（グランドキャビン・公売）８月２日公開">
+      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/water/pdf/gesuisiteisinsei_annai.pdf" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/second/Notices.html" beforeDir="false" afterPath="$PROJECT_DIR$/second/Notices.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fourth/living/Procedures_for_designated_sewer.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Procedures_for_designated_sewer.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -108,11 +101,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$/third/notices" />
       <recent name="$PROJECT_DIR$/css/pdf/audit" />
       <recent name="$PROJECT_DIR$/fourth/lifeguide/water/images" />
       <recent name="$PROJECT_DIR$/fourth/notices" />
-      <recent name="$PROJECT_DIR$/fourth/education/pdf/childcare_cooperation/1" />
     </key>
   </component>
   <component name="RunManager">
@@ -220,14 +213,15 @@
       <workItem from="1626407116392" duration="4000" />
       <workItem from="1626413027082" duration="403000" />
       <workItem from="1626413438107" duration="791000" />
-      <workItem from="1626755746389" duration="2852000" />
-    </task>
-    <task id="LOCAL-00075" summary="[kitagata_support-12818] HP更新依頼（バランスシート）">
-      <created>1623209723433</created>
-      <option name="number" value="00075" />
-      <option name="presentableId" value="LOCAL-00075" />
-      <option name="project" value="LOCAL" />
-      <updated>1623209723433</updated>
+      <workItem from="1626755746389" duration="2956000" />
+      <workItem from="1626758930922" duration="1000" />
+      <workItem from="1626771980682" duration="1000" />
+      <workItem from="1626772033705" duration="107000" />
+      <workItem from="1626774690161" duration="1000" />
+      <workItem from="1626774704405" duration="9000" />
+      <workItem from="1626832922847" duration="4000" />
+      <workItem from="1626833239884" duration="129000" />
+      <workItem from="1627267429822" duration="605000" />
     </task>
     <task id="LOCAL-00076" summary="[kitagata_support-12824] 【健康推進課】ＨＰ更新依頼（コロナワクチン接種ページ）">
       <created>1623212802079</created>
@@ -565,7 +559,14 @@
       <option name="project" value="LOCAL" />
       <updated>1626755610827</updated>
     </task>
-    <option name="localTasksCounter" value="124" />
+    <task id="LOCAL-00124" summary="[kitagata_support-13092] HP更新依頼（グランドキャビン・公売）８月２日公開">
+      <created>1626758835792</created>
+      <option name="number" value="00124" />
+      <option name="presentableId" value="LOCAL-00124" />
+      <option name="project" value="LOCAL" />
+      <updated>1626758835792</updated>
+    </task>
+    <option name="localTasksCounter" value="125" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -612,7 +613,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="[kitagata_support-12958] 【HP更新依頼】きたがたり" />
     <MESSAGE value="[kitagata_support-12960] HP更新依頼（ライフイベント）" />
     <MESSAGE value="[kitagata_support-12961] HP更新依頼（方針と重点）" />
     <MESSAGE value="[kitagata_support-12934] HP修正依頼（がん患者医療用補正具購入費助成事業）" />
@@ -637,9 +637,10 @@
     <MESSAGE value="[kitagata_support-13080] HP更新依頼（保育園）" />
     <MESSAGE value="[kitagata_support-13081] HP更新依頼（町政情報＞監査）" />
     <MESSAGE value="[kitagata_support-13090] 再送：ホームページ更新依頼（国保税）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13090] 再送：ホームページ更新依頼（国保税）" />
+    <MESSAGE value="[kitagata_support-13092] HP更新依頼（グランドキャビン・公売）８月２日公開" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13092] 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" />
   </component>
-</project>
+</project>

fourth/living/Procedures_for_designated_sewer.html

@@ -146,7 +146,7 @@ new google.translate.TranslateElement({pageLanguage: 'ja', layout: google.transl
    </div>
    <span id="template_article_block">
     <p class="paragraphT10">
-指定を希望する事業者様は、<strong><a href="../../fourth/lifeguide/water/pdf/siteitensinsei_annai.pdf" target="_blank">指定申請のご案内</a></strong>をご確認いただき、申請書類を上下水道課へ提出してください。</br>
+指定を希望する事業者様は、<strong><a href="../../fourth/lifeguide/water/pdf/gesuisiteisinsei_annai.pdf" target="_blank">指定申請のご案内</a></strong>をご確認いただき、申請書類を上下水道課へ提出してください。</br>
 </br>
 手続きに要する期間はおよそ15日で、手数料 14,000円が必要です。</br>
 指定の有効期限はありません。届出事項の変更等がある場合は変更の届出が必要です。