コード整理

.project

-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>checkWeb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

abweb/common/js/constant.js

@@ -65,11 +65,8 @@ CONSTANT.URL = {
             PUSH_MESSAGE_DETAIL: 'pushMessageDetail/',
             PUSH_MESSAGE_LIST: 'pushMessageList/',
             SEND_PUSH_MESSAGE: 'sendPushMessage/',
-<<<<<<< HEAD
             IS_QUICK_REPORT: 'getOperationData/isQuickReport',
 
-=======
->>>>>>> feature/1.0_check_web_dev
         },
         HTML: {
             BASE: 'html/',

abweb/html/pickup.html

@@ -22,9 +22,6 @@
     <script src="../common/js/common.js?__UPDATEID__"></script>
     <script src="../common/js/header.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
-    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__" defer></script>
-    <script src="../common/js/event.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
     
     <!-- main js -->
     <script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script>
@@ -32,6 +29,9 @@
     <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
     <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/template/template.js"></script>
+    <script type="text/javascript" src="../common/js/app.js?__UPDATEID__" defer></script>
+    <script src="../common/js/event.js?__UPDATEID__"></script>
+    <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
     
     <script type="text/javascript" src="../js/topPage/topPage.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../js/pickup/pickup.js"></script>

abweb/html/pushMessageDetail.html

@@ -15,8 +15,6 @@
     <!-- vender css -->
     <link rel="stylesheet" type="text/css" href="../common/css/fontawesome_relative_path.css">
 
-    <script type="text/javascript" src="../common/js/app.js"></script>
-    <script src="../common/js/event.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
     <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
@@ -73,6 +71,8 @@
             </div>
         </div>
     </main>
+    <script type="text/javascript" src="../common/js/app.js"></script>
+    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>
 
 </html>
\ No newline at end of file

abweb/html/pushMessageList.html

@@ -22,8 +22,6 @@
     <script type="text/javascript" src="../js/template/template.js"></script>
     <script src="../common/js/constant.js?__UPDATEID__"></script>
     <script src="../common/js/common.js?__UPDATEID__"></script>
-    <script type="text/javascript" src="../common/js/app.js"></script>
-    <script src="../common/js/event.js?__UPDATEID__"></script>
 
     <script type="text/javascript" src="../js/pushMessageList/pushMessageList.js"></script>
 
@@ -54,5 +52,7 @@
             </ul>
         </div>
     </main>
+    <script type="text/javascript" src="../common/js/app.js"></script>
+    <script src="../common/js/event.js?__UPDATEID__"></script>
 </body>
 </html>
\ No newline at end of file