Browse Source

修改上傳工具 檔案路徑

steve07s 3 years ago
parent
commit
d0e36740b6

+ 113 - 13
Upload.html

@@ -1,17 +1,117 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-  <title></title>
+    <title>設計群匯入工具</title>
+    <meta charset="utf-8">
+    <link rel="shortcut icon" href="./assets/images/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="./script/css/form.css" />
+    <link href='https://fonts.googleapis.com/css?family=Lato:100,200,300,400,500,600,700' rel='stylesheet'
+        type='text/css'>
+    <link rel="stylesheet" href="./assets/vendor/font-awesome/css/font-awesome.css" />
+    <script src="./assets/vendor/jquery/jquery.js"></script>
 </head>
-<body>
-  <form action="./script/php/excelTool.php"
-        enctype="multipart/form-data"
-        method="post">
-    <input id="excel"
-          name="excel"
-          type="file"> <input name="project_id"
-          type="text"> <input type="submit"
-          value="Upload">
-  </form>
-</body>
-</html>
+<form method="post" enctype="multipart/form-data" action="./script/php/importTool/uploadExcel.php">
+
+    <h1><strong>MAA</strong> 設計群匯入工具</h1>
+
+    <div class="form-group">
+        <label for="projectId">計畫編號 </label>
+        <input type="text" name="projectId" id="projectId" class="form-controll" required="required" />
+    </div>
+    <div class="form-group">
+        <label for="projectName">計畫名稱 </label>
+        <input type="text" name="projectName" id="projectName" class="form-controll" required="required" />
+    </div>
+    <div class="form-group">
+        <label for="category">工程類別</label>
+        <select name="category" id="category" class="form-controll" required="required">
+        </select>
+    </div>
+
+    <div class="form-group file-area">
+        <label for="excel">Excel文件</label>
+        <input type="file" name="excel" id="excel" required="required"
+            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
+        <div class="file-dummy">
+            <div class="success">你已經選擇<span id="filename"></span>。 請繼續下一步。</div>
+            <div class="default">選擇Excel文件</div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <p><strong>注意事項:</strong>Excel檔名請用計畫編號命名。 (例:15032.xlsx)</p>
+        <button type="submit">上傳檔案</button>
+    </div>
+
+</form>
+<a href="./index.php" class="back-to-article" target="_blank">返回至查詢工具</a>
+
+<script type="text/javascript">
+    var projectTable;
+    var projectName;
+    $(document).ready(function () {
+        getCategory();
+        $("#projectId").change(function () {
+            const find = projectTable.find(element => element[0] == this.value);
+            if (find != null) {
+                projectName = find[1];
+                category = find[2];
+                $("#projectName").val(projectName);
+                $("#projectName").css("cursor", "not-allowed");
+                $('#projectName').attr('readonly', true);
+                $('#category').val(category);
+                $("#category").css("cursor", "not-allowed");
+                $('#category').prop('disabled', true);
+            } else {
+                $("#projectName").val("");
+                $("#projectName").css("cursor", "text");
+                $('#projectName').attr('readonly', false);
+                $('#category').val(1);
+                $("#category").css("cursor", "default");
+                $('#category').prop('disabled', false);
+            }
+
+        });
+    });
+    var inputElement = document.getElementById("excel");
+    inputElement.addEventListener("change", handleFiles, false);
+
+    function handleFiles() {
+        var fileList = this.files;
+        $("#filename").text(fileList[0].name);
+    }
+
+    jQuery(function ($) {
+        $('form').bind('submit', function () {
+            $(this).find(':input').prop('disabled', false);
+        });
+    });
+
+    function getCategory() {
+
+        $.ajax({
+                url: "./script/php/importTool/getConstructionCategory.php",
+                async: false,
+                contentType: "application/json",
+                dataType: "json",
+                type: "GET",
+            })
+            .success(function (response) {
+                projectTable = response["project"];
+                for (i = 0; i < response["category"].length; i++) {
+                    $('#category').append(
+                        `<option value='${response["category"][i][0]}'>${response["category"][i][1]}</option>`);
+                }
+            })
+            .error(function (error) {
+                console.log(error);
+            })
+            .complete(function () {
+                $('#page0').addClass('in active')
+            });
+    }
+</script>
+
+</html>

+ 6 - 3
index.php

@@ -12,7 +12,7 @@ if (!isset($_SESSION['loggedin'])) {
 <head>
 	<!-- Basic -->
 	<meta charset="UTF-8">
-	<title>資料庫管理</title>
+	<title>設計資料庫查詢系統</title>
 	<meta name="keywords" content="HTML5 Admin Template" />
 	<meta name="description" content="JSOFT Admin - Responsive HTML5 Template">
 	<meta name="author" content="JSOFT.net">
@@ -581,7 +581,7 @@ if (!isset($_SESSION['loggedin'])) {
 		<!-- start: header -->
 		<header class="header">
 			<div class="logo-container">
-				<div class="banner-txt">資料庫管理</div>
+				<div class="banner-txt">設計資料庫查詢系統</div>
 				<div class="visible-xs toggle-sidebar-left" data-toggle-class="sidebar-left-opened" data-target="html" data-fire-event="sidebar-left-opened">
 					<i class="fa fa-bars" aria-label="Toggle sidebar"></i>
 				</div>
@@ -591,6 +591,9 @@ if (!isset($_SESSION['loggedin'])) {
 				<span class="separator"></span>
 				<ul class="notifications">
 					<li>
+					<a href="/DataBase/script/php/importTool/upload.php" class="notification-icon" data-toggle="tooltip" title="匯入工具" data-placement="bottom">
+							<i class="fa fa-upload"></i>
+						</a>
 						<a href="/Front-Page/home.php" class="notification-icon" data-toggle="tooltip" title="綜合登入入口" data-placement="bottom">
 							<i class="fa fa-home"></i>
 						</a>
@@ -600,7 +603,7 @@ if (!isset($_SESSION['loggedin'])) {
 				<div id="userbox" class="userbox">
 					<a href="#" data-toggle="dropdown">
 						<figure class="profile-picture"> <img src="assets/images/!logged-user.jpg" alt="Joseph Doe" class="img-circle" data-lock-picture="assets/images/!logged-user.jpg" /> </figure>
-						<div class="profile-info" data-lock-name="John Doe" data-lock-email="johndoe@JSOFT.com"> <span class="name"><?php echo $_SESSION['name'] ?></span> <span class="role">administrator</span> </div> <i class="fa custom-caret"></i>
+						<div class="profile-info" data-lock-name="John Doe" data-lock-email="johndoe@JSOFT.com"> <span class="name"><?php echo $_SESSION['name'] ?></span> <span class="role">tester</span> </div> <i class="fa custom-caret"></i>
 					</a>
 					<div class="dropdown-menu">
 						<ul class="list-unstyled">

+ 0 - 0
script/php/importTool/form.css → script/css/form.css


BIN
script/php/importTool/hello world.xlsx


BIN
script/php/importTool/home.sql


+ 1 - 1
script/php/importTool/insertExcel.php

@@ -140,4 +140,4 @@ $sql = "IF NOT EXISTS (SELECT [list_id] FROM [Category_List] WHERE [category_lis
             END";
 $fetchResult = sqlsrv_query($conn, $sql);
 sqlsrv_close($conn);
-header("Location: ./upload.html");
+header("Location: ../../../upload.html");

+ 0 - 39
script/php/importTool/test.html

@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>設計群匯入工具</title>
-    <meta charset="utf-8">
-    <link rel="shortcut icon" href="/Database/assets/images/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
-    <script src="/DataBase/assets/vendor/jquery/jquery.js"></script>
-    <script src="/DataBase/script/js/bootstrap.js"></script>
-    <link rel="stylesheet" href="/DataBase/assets/vendor/font-awesome/css/font-awesome.css" />
-    
-</html>
-<body>
-    <form id="form" method="post" action="./test.php">
-        <input type="text" name="id" id="id" />
-        <input type="submit" name="submit" id="submit" />
-    </form>
-<script>/*
-    $.ajax({
-                    url: "./test.php",
-                    data: {id: 1},
-                    async: false,
-                    //contentType: "application/json",
-                    dataType: "json",
-                    type: "POST",
-                })
-                .success(function(response) {
-                    console.log(response);
-                })
-                .error(function(error) {
-                    console.log(error);
-                })
-                .complete(function() {
-                   
-                });*/
-</script>
-</body>

+ 0 - 17
script/php/importTool/test.php

@@ -1,17 +0,0 @@
-<?php
-include("../sql.php");
-$connectionInfo = array("Database" => "$dbname", "UID" => "$username", "PWD" => "$password", "CharacterSet" => "UTF-8");
-$conn = sqlsrv_connect($hostname, $connectionInfo);
-if ($conn === false) {
-    die(print_r(sqlsrv_errors(), true));
-}
-$data = array();
-$id = $_POST["id"];
-$sql = "SELECT [category_name] FROM [Construction_Category] WHERE [category_id] = ?";
-
-
-$fetchResult = sqlsrv_query($conn, $sql, array($id));
-while ($row = sqlsrv_fetch_array($fetchResult)) {
-    array_push($data, $row);
-}
-echo json_encode($data, JSON_UNESCAPED_UNICODE);

+ 0 - 117
script/php/importTool/upload.html

@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>設計群匯入工具</title>
-    <meta charset="utf-8">
-    <link rel="shortcut icon" href="/Database/assets/images/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="form.css" />
-    <link href='https://fonts.googleapis.com/css?family=Lato:100,200,300,400,500,600,700' rel='stylesheet'
-        type='text/css'>
-    <link rel="stylesheet" href="/DataBase/assets/vendor/font-awesome/css/font-awesome.css" />
-    <script src="/DataBase/assets/vendor/jquery/jquery.js"></script>
-</head>
-<form method="post" enctype="multipart/form-data" action="./index.php">
-
-    <h1><strong>MAA</strong> 設計群匯入工具</h1>
-
-    <div class="form-group">
-        <label for="projectId">計畫編號 </label>
-        <input type="text" name="projectId" id="projectId" class="form-controll" required="required" />
-    </div>
-    <div class="form-group">
-        <label for="projectName">計畫名稱 </label>
-        <input type="text" name="projectName" id="projectName" class="form-controll" required="required" />
-    </div>
-    <div class="form-group">
-        <label for="category">工程類別</label>
-        <select name="category" id="category" class="form-controll" required="required">
-        </select>
-    </div>
-
-    <div class="form-group file-area">
-        <label for="excel">Excel文件</label>
-        <input type="file" name="excel" id="excel" required="required"
-            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
-        <div class="file-dummy">
-            <div class="success">你已經選擇<span id="filename"></span>。 請繼續下一步。</div>
-            <div class="default">選擇Excel文件</div>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <p><strong>注意事項:</strong>Excel檔名請用計畫編號命名。 (例:15032.xlsx)</p>
-        <button type="submit">上傳檔案</button>
-    </div>
-
-</form>
-<a href="../../../index.php" class="back-to-article" target="_blank">返回至查詢工具</a>
-
-<script type="text/javascript">
-    var projectTable;
-    var projectName;
-    $(document).ready(function () {
-        getCategory();
-        $("#projectId").change(function () {
-            const find = projectTable.find(element => element[0] == this.value);
-            if (find != null) {
-                projectName = find[1];
-                category = find[2];
-                $("#projectName").val(projectName);
-                $("#projectName").css("cursor", "not-allowed");
-                $('#projectName').attr('readonly', true);
-                $('#category').val(category);
-                $("#category").css("cursor", "not-allowed");
-                $('#category').prop('disabled', true);
-            } else {
-                $("#projectName").val("");
-                $("#projectName").css("cursor", "text");
-                $('#projectName').attr('readonly', false);
-                $('#category').val(1);
-                $("#category").css("cursor", "default");
-                $('#category').prop('disabled', false);
-            }
-
-        });
-    });
-    var inputElement = document.getElementById("excel");
-    inputElement.addEventListener("change", handleFiles, false);
-
-    function handleFiles() {
-        var fileList = this.files;
-        $("#filename").text(fileList[0].name);
-    }
-
-    jQuery(function ($) {
-        $('form').bind('submit', function () {
-            $(this).find(':input').prop('disabled', false);
-        });
-    });
-
-    function getCategory() {
-
-        $.ajax({
-                url: "./getConstructionCategory.php",
-                async: false,
-                contentType: "application/json",
-                dataType: "json",
-                type: "GET",
-            })
-            .success(function (response) {
-                projectTable = response["project"];
-                for (i = 0; i < response["category"].length; i++) {
-                    $('#category').append(
-                        `<option value='${response["category"][i][0]}'>${response["category"][i][1]}</option>`);
-                }
-            })
-            .error(function (error) {
-                console.log(error);
-            })
-            .complete(function () {
-                $('#page0').addClass('in active')
-            });
-    }
-</script>
-
-</html>

+ 0 - 8
script/php/importTool/upload.php

@@ -1,8 +0,0 @@
-<?php
-if (0 < $_FILES['excel']['error']) {
-    echo 'Error: ' . $_FILES['excel']['error'] . '<br>';
-} else {
-    move_uploaded_file($_FILES['excel']['tmp_name'], 'uploads/' . $_FILES['excel']['name']);
-    $project_id = pathinfo($_FILES['excel']['name'])['filename'];
-    header("Location: ./index.php?excel={$_FILES['excel']['name']}");
-}

+ 1 - 1
script/php/importTool/index.php → script/php/importTool/uploadExcel.php

@@ -1,6 +1,6 @@
 <?php
 if(!isset($_FILES['excel']['error'])){
-    header("Location: ./upload.html");
+    header("Location: /DataBase/upload.html");
 }
 if (0 < $_FILES['excel']['error']) {
     echo 'Error: ' . $_FILES['excel']['error'] . '<br>';

BIN
script/php/importTool/uploads/00000.xlsx