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

.idea/workspace.xml

@@ -25,9 +25,11 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13064] HP更新依頼（特別給付金）">
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13071] HP更新依頼　（電子入札・申請書等）">
+      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/water/images/img_cleanwaterfunction.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fourth/lifeguide/water/images/img_upwater.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/third/Coronavirus/Coronavirus_210415.html" beforeDir="false" afterPath="$PROJECT_DIR$/third/Coronavirus/Coronavirus_210415.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fourth/living/Overview_of_water_supply.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/living/Overview_of_water_supply.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,11 +102,11 @@
       <recent name="$PROJECT_DIR$/third/Public_transport" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/fourth/lifeguide/water/images" />
       <recent name="$PROJECT_DIR$/fourth/notices" />
       <recent name="$PROJECT_DIR$/fourth/education/pdf/childcare_cooperation/1" />
       <recent name="$PROJECT_DIR$/fourth/education/pdf/club_activities/1" />
       <recent name="$PROJECT_DIR$/fourth/education/pdf/school_pta/1" />
-      <recent name="$PROJECT_DIR$/fourth/education/pdf/school_management/1" />
     </key>
   </component>
   <component name="RunManager">
@@ -209,20 +211,9 @@
       <workItem from="1626051954198" duration="331000" />
       <workItem from="1626052356089" duration="701000" />
       <workItem from="1626140424729" duration="8087000" />
-    </task>
-    <task id="LOCAL-00070" summary="[kitagata_support-12727] HP更新依頼【都市環境課】都市計画様式の差し替え">
-      <created>1622079156652</created>
-      <option name="number" value="00070" />
-      <option name="presentableId" value="LOCAL-00070" />
-      <option name="project" value="LOCAL" />
-      <updated>1622079156652</updated>
-    </task>
-    <task id="LOCAL-00071" summary="[kitagata_support-12777] HP更新依頼（定期監査の結果）">
-      <created>1622887961955</created>
-      <option name="number" value="00071" />
-      <option name="presentableId" value="LOCAL-00071" />
-      <option name="project" value="LOCAL" />
-      <updated>1622887961956</updated>
+      <workItem from="1626407116392" duration="4000" />
+      <workItem from="1626413027082" duration="403000" />
+      <workItem from="1626413438107" duration="791000" />
     </task>
     <task id="LOCAL-00072" summary="[kitagata_support-12799] 【HP更新依頼】予算概要（消費税使途明確化）">
       <created>1622888549699</created>
@@ -553,7 +544,21 @@
       <option name="project" value="LOCAL" />
       <updated>1626336418070</updated>
     </task>
-    <option name="localTasksCounter" value="119" />
+    <task id="LOCAL-00119" summary="[kitagata_support-13065] HP更新依頼(イベント中止情報）">
+      <created>1626336785626</created>
+      <option name="number" value="00119" />
+      <option name="presentableId" value="LOCAL-00119" />
+      <option name="project" value="LOCAL" />
+      <updated>1626336785626</updated>
+    </task>
+    <task id="LOCAL-00120" summary="[kitagata_support-13071] HP更新依頼　（電子入札・申請書等）">
+      <created>1626413298855</created>
+      <option name="number" value="00120" />
+      <option name="presentableId" value="LOCAL-00120" />
+      <option name="project" value="LOCAL" />
+      <updated>1626413298855</updated>
+    </task>
+    <option name="localTasksCounter" value="121" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -600,8 +605,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="[kitagata_support-12927] HP更新依頼(先端設備等導入計画）" />
-    <MESSAGE value="[kitagata_support-12928] HP更新依頼（児童福祉整理）" />
     <MESSAGE value="[kitagata_support-12932] HP更新依頼（カローリング）" />
     <MESSAGE value="[kitagata_support-12932] HP更新依頼（カローリング）　一部修正" />
     <MESSAGE value="[kitagata_support-12957] 【HP更新依頼】町長のつぶやき" />
@@ -625,7 +628,9 @@
     <MESSAGE value="[kitagata_support-13050] Re- HP更新依頼（プレミアム商品券販売）" />
     <MESSAGE value="[kitagata_support-13054] ホームページ更新依頼（国保税）" />
     <MESSAGE value="[kitagata_support-13064] HP更新依頼（特別給付金）" />
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13064] HP更新依頼（特別給付金）" />
+    <MESSAGE value="[kitagata_support-13065] HP更新依頼(イベント中止情報）" />
+    <MESSAGE value="[kitagata_support-13071] HP更新依頼　（電子入札・申請書等）" />
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13071] 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" />

fourth/living/Overview_of_water_supply.html

@@ -254,7 +254,7 @@ new google.translate.TranslateElement({pageLanguage: 'ja', layout: google.transl
     </div>
    </div>
    <span id="template_article_block">
-<img src="../lifeguide/water/images/img_upwater.jpg" width="630" id="center" /></br>
+<img src="../lifeguide/water/images/img_upwater.png" width="630" id="center" /></br>
     <p class="paragraphT10">
 地下150メートルからくみあげられた地下水は、滅菌室での塩素消毒を経て、いったん配水池（タンク）に貯められます。</br>
 </br>

third/business/electronic_bidding.html

@@ -178,16 +178,16 @@ new google.translate.TranslateElement({pageLanguage: 'ja', layout: google.transl
 	<p class="paragraphT10">（例）資格者番号「0123」の場合「000000123」となります。</p>
 						</span>
 					</article>
-					<article id="template_list_title" >
-						<div id="template_title2" class="gothic">
-							<div id="template_title_block">
-								<span id="template_title2">申請書等</span>
-							</div>
-						</div>
-						<span id="template_article_block"><p class="paragraphT10">下記よりダウンロードして下さい。</p>
-    <p class="paragraphT10"><a href="../../third/living/Application_bid_and_contract.html">入札参加資格申請書（申請書等ダウンロードページ）</a></p>
-						</span>
-					</article>
+<!--					<article id="template_list_title" >-->
+<!--						<div id="template_title2" class="gothic">-->
+<!--							<div id="template_title_block">-->
+<!--								<span id="template_title2">申請書等</span>-->
+<!--							</div>-->
+<!--						</div>-->
+<!--						<span id="template_article_block"><p class="paragraphT10">下記よりダウンロードして下さい。</p>-->
+<!--    <p class="paragraphT10"><a href="../../third/living/Application_bid_and_contract.html">入札参加資格申請書（申請書等ダウンロードページ）</a></p>-->
+<!--						</span>-->
+<!--					</article>-->
 				</section>
 			</div>