From 13eac5639c281643b5b8f9f4dd95b52cb581f165 Mon Sep 17 00:00:00 2001
From: dev02 <dev02@yourteam.tw>
Date: Tue, 22 Nov 2022 17:13:47 +0800
Subject: [PATCH 1/3] testing historyData baja

---
 Frontend/_historyData.html | 93 +++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html
index aedb623..9b3d031 100644
--- a/Frontend/_historyData.html
+++ b/Frontend/_historyData.html
@@ -8,7 +8,6 @@
                 </div>
                 <!-- nav-menu-reset will reset the font colors -->
                 <ul id="js_nested_list" class="nav-menu nav-menu-reset nav-menu-compact bg-success-900 bg-info-gradient mb-sm-4 mb-md-0 rounded" data-nav-accordion="true">
-
                 </ul>
                 <div class="filter-message js-filter-message m-0 text-left pl-4 py-3 fw-500"></div>
             </div>
@@ -53,7 +52,7 @@
 
             <div class="row">
                 <div class="frame-wrap">
-                    <table class="table table-bordered table-striped text-center m-0">
+                    <table id="tableData" class="table table-bordered table-striped text-center m-0">
                         <thead class="thead-themed">
                             <tr>
                                 <th>設備名稱</th>
@@ -78,20 +77,19 @@
 </main>
 
 <script>
-    let sst = '';
-    let mst = '';
+    
     $(function () {
         initList();
 
-		// default list filter
-		initApp.listFilter($('#js_default_list'), $('#js_default_list_filter'));
-		// custom response message
-		initApp.listFilter($('#js-list-msg'), $('#js-list-msg-filter'));
-		//accordion filter
-		initApp.listFilter($('#js_list_accordion'), $('#js_list_accordion_filter'));
-		// nested list filter
-		initApp.listFilter($('#js_nested_list'), $('#js_nested_list_filter'));
-		//init navigation
+        // default list filter
+        initApp.listFilter($('#js_default_list'), $('#js_default_list_filter'));
+        // custom response message
+        initApp.listFilter($('#js-list-msg'), $('#js-list-msg-filter'));
+        //accordion filter
+        initApp.listFilter($('#js_list_accordion'), $('#js_list_accordion_filter'));
+        // nested list filter
+        initApp.listFilter($('#js_nested_list'), $('#js_nested_list_filter'));
+        //init navigation
         initApp.buildNavigation($('#js_nested_list'));
 
         initData();
@@ -99,64 +97,65 @@
 
     function initList() {
         let sendData = {
-			building_tag: pageAct.buiTag
+            building_tag: pageAct.buiTag
         }
-		objSendData.Data = sendData;
+        objSendData.Data = sendData;
         let url = baseApiUrl + "/api/History/GetMainSub";
-		function success(res) {
+        function success(res) {
             let strHtml = ``;
+			let sst = '';
+            let mst = '';
 
             $.each(res.data.history_Main_Systems, function (index, val) {
-                console.log(index)
-				strHtml += `<li>
-	                            <a href="#" data-filter-tags="user interface buttons compass action dropdown navigation sidebars" data-maintag="${val.main_system_tag}">
-		                            <span class="nav-link-text">${val.full_name}</span>
-	                            </a>
+                strHtml += `<li>
+                                <a href="#" data-filter-tags="user interface buttons compass action dropdown navigation sidebars" data-maintag="${val.main_system_tag}">
+                                    <span class="nav-link-text">${val.full_name}</span>
+                                </a>
                                 <ul style="${index == 0 ? `display:block;` : ``}">`;
-                    
+
                 $.each(val.history_Sub_systems, function (index2, val2) {
                     strHtml += `<li>
-			                        <a href="#" onClick="getData(${val2.sub_system_tag}, ${val.main_system_tag})" data-filter-tags="user interface buttons" data-subtag="${val2.sub_system_tag}">
-				                        <span class="nav-link-text">
-					                        ${val2.full_name} ${val2.sub_system_tag}
-				                        </span>
-			                        </a>
-		                        </li>`;
+                                    <a href="#" onClick="getData(${val2.sub_system_tag}, ${val.main_system_tag})" data-filter-tags="user interface buttons" data-subtag="${val2.sub_system_tag}">
+                                        <span class="nav-link-text">
+                                            ${val2.full_name} ${val2.sub_system_tag}
+                                        </span>
+                                    </a>
+                                </li>`;
 
                     if (index == 0 && index2 == 0) {
                         sst = val2.sub_system_tag;
                         mst = val.main_system_tag;
-					}
+                    }
                 });
                 strHtml += `</ul> </li>`;
             });
 
             $('#js_nested_list').html(strHtml);
             getData(sst, mst);
-		}
+        }
         ytAjax = new YourTeam.Ajax(url, objSendData, success, null, "POST").send();
     }
 
     function initData() {
-		getHistoryDataByBaja("TPE_B1_EE_E4_R2F_NA_WHT_N1_A1",
-			1667232000000,
-			1667232000000,
-			"空調設備",
-			"Mitsubishi_Sup",
-			callbackForHistory);
-	}
+        getHistoryDataByBaja("TPE_B1_EE_E4_R2F_NA_WHT_N1_A1",
+            1667232000000,
+            1667232000000,
+            "空調設備",
+            "Mitsubishi_Sup",
+            callbackForHistory);
+    }
 
-    function getData(sst2, mst1)
-    {
-		//getHistoryDataByBaja("TPE_B1_EE_E4_R2F_NA_WHT_N1_A1",
-		//	1667232000000,
-		//	1667232000000,
-		//	"空調設備",
-		//	"Mitsubishi_Sup",
-		//	callbackForHistory);
-	}
+    function getData(sst2, mst1) {
+        //getHistoryDataByBaja("TPE_B1_EE_E4_R2F_NA_WHT_N1_A1",
+        //	1667232000000,
+        //	1667232000000,
+        //	"空調設備",
+        //	"Mitsubishi_Sup",
+        //	callbackForHistory);
+    }
 
     function callBackFromHistory(res) {
+        //$('#tableData tbody').html();
         console.log(res)
-	}
+    }
 </script>
\ No newline at end of file

From 7b446823f06b67f54e8eeb88121d34cbac2afdd6 Mon Sep 17 00:00:00 2001
From: SinoroWu <w0923915919@outlook.com>
Date: Tue, 22 Nov 2022 17:18:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AA=BF=E6=95=B4=20=5FgraphManagement.htm?=
 =?UTF-8?q?l=20=E9=A0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_graphManagement.html | 89 +++++++++++-----------------------
 1 file changed, 27 insertions(+), 62 deletions(-)

diff --git a/Frontend/_graphManagement.html b/Frontend/_graphManagement.html
index 4ab4c59..f09e981 100644
--- a/Frontend/_graphManagement.html
+++ b/Frontend/_graphManagement.html
@@ -64,7 +64,7 @@
 
             <div class="row">
                 <div class="mb-3">
-                    <a href="#" class="btn btn-success">+ 上傳</a>
+                    <a href="#" class="btn btn-success" data-toggle="modal" data-target="#uploadPicture">+ 上傳</a>
                 </div>
 
                 <table class="table table-bordered table-striped text-center m-0">
@@ -108,41 +108,52 @@
 
 </main>
 
-<!-- TEST Button trigger modal -->
-<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#staticBackdrop">
-    Launch static backdrop modal
-</button>
-
-<div class="mb-3"> <a href="#" class="btn btn-success" data-toggle="modal" data-target="#accManModal">+ 新增</a>
-</div>
-
-<div class="modal fade" id="accManModal" tabindex="-1" role="dialog" aria-hidden="true">
+<!-- Upload Picture modal -->
+<div class="modal fade" id="uploadPicture" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">
-                    人員基本資料新增 / 修改
+                    圖資上傳
                 </h4>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true"><i class="fal fa-times"></i></span>
                 </button>
             </div>
-            <form id="accManForm">
+            <form id="uploadForm">
                 <div class="modal-body">
                     <div class="row">
                         <div class="col-md-6">
                             <div class="form-group">
-                                <label class="form-label" for="inpEmail">Email</label>
-                                <input type="email" id="inpEmail" name="inpEmail" class="form-control"
-                                    placeholder="Email">
+                                <label class="form-label" for="picNum">圖號</label>
+                                <input type="text" id="picNum" name="picNum" class="form-control">
                             </div>
                         </div>
                         <div class="col-md-6">
                             <div class="form-group">
-                                <label class="form-label" for="inpName">姓名</label>
+                                <label class="form-label" for="inpName">圖名</label>
                                 <input type="text" id="inpName" name="inpName" class="form-control">
                             </div>
                         </div>
+                        <div class="col-md-6">
+                            <div class="form-group mt-2">
+                                <label class="form-label" for="mainCategory">主要類別</label>
+                                <input type="text" id="mainCategory" name="mainCategory" class="form-control">
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="form-group mt-2">
+                                <label class="form-label" for="subcategory">子類別</label>
+                                <input type="text" id="subcategory" name="subcategory" class="form-control">
+                            </div>
+                        </div>
+                        <div class="col-md-12">
+                            <button type="button" class="btn btn-secondary">上傳檔案</button>
+                        </div>
+                        <small>欲上傳之檔案名</small>
+                        <div class="col-md-12">
+                            <button type="button" class="btn btn-secondary mt-2">上傳檔案</button>
+                        </div>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -152,50 +163,4 @@
             </form>
         </div>
     </div>
-</div>
-
-<!-- TEST Modal -->
-<div class="modal fade" id="staticBackdrop" data-backdrop="static" data-keyboard="false" tabindex="-1"
-    aria-labelledby="staticBackdropLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="staticBackdropLabel">Modal title</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                ...
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-primary">Understood</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog"
-    aria-labelledby="modal-shortcut" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-top modal-transparent" role="document">
-        <div class="modal-content">
-            <div class="modal-body">
-                <ul class="app-list w-auto h-auto p-0 text-left">
-                    <li>
-                        <a href="intel_introduction.html" class="app-list-item text-white border-0 m-0">
-                            <div class="icon-stack">
-                                <i class="base base-7 icon-stack-3x opacity-100 color-primary-500 "></i>
-                                <i class="base base-7 icon-stack-2x opacity-100 color-primary-300 "></i>
-                                <i class="fal fa-home icon-stack-1x opacity-100 color-white"></i>
-                            </div>
-                            <span class="app-list-name">
-                                Home
-                            </span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
 </div>
\ No newline at end of file

From 6899d019f4456169b716ce70c77842522e2c7fb2 Mon Sep 17 00:00:00 2001
From: SinoroWu <w0923915919@outlook.com>
Date: Tue, 22 Nov 2022 18:09:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AA=BF=E6=95=B4=20=5FgraphManagement.htm?=
 =?UTF-8?q?l=20=E9=A0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_graphManagement.html | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Frontend/_graphManagement.html b/Frontend/_graphManagement.html
index f09e981..5b599b5 100644
--- a/Frontend/_graphManagement.html
+++ b/Frontend/_graphManagement.html
@@ -136,23 +136,35 @@
                             </div>
                         </div>
                         <div class="col-md-6">
-                            <div class="form-group mt-2">
+                            <div class="form-group mt-3">
                                 <label class="form-label" for="mainCategory">主要類別</label>
                                 <input type="text" id="mainCategory" name="mainCategory" class="form-control">
                             </div>
                         </div>
+
                         <div class="col-md-6">
-                            <div class="form-group mt-2">
+                            <div class="form-group mt-3">
                                 <label class="form-label" for="subcategory">子類別</label>
                                 <input type="text" id="subcategory" name="subcategory" class="form-control">
                             </div>
                         </div>
-                        <div class="col-md-12">
-                            <button type="button" class="btn btn-secondary">上傳檔案</button>
+                        <div class="col-md-12 mt-3">
+                            <label>原設計</label>
                         </div>
-                        <small>欲上傳之檔案名</small>
                         <div class="col-md-12">
-                            <button type="button" class="btn btn-secondary mt-2">上傳檔案</button>
+                            <button type="button" class="btn btn-info">上傳檔案</button>
+                        </div>
+                        <div class="col-md-12 mt-1">
+                            <small>欲上傳之檔案名稱</small>
+                        </div>
+                        <div class="col-md-12 mt-3">
+                            <label>竣工圖</label>
+                        </div>
+                        <div class="col-md-12">
+                            <button type="button" class="btn btn-info">上傳檔案</button>
+                        </div>
+                        <div class="col-md-12 mt-1">
+                            <small>欲上傳之檔案名稱</small>
                         </div>
                     </div>
                 </div>