Browse Source

新增權限功能 1.0
刪除不必要檔案

manto07m 3 years ago
parent
commit
bd1a74b556

+ 0 - 133
Upload-old.html

@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <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>
-<a href="./edit.html" class="go-to-editor" target="_self">進入至編輯工具</a>
-<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 center">
-        <p><strong>注意事項:</strong>Excel檔名請包含計畫編號。 (例:15032.xlsx)</p>
-        <button type="submit">上傳檔案</button>
-        <button id="reset" type="button">清除表單</button>
-    </div>
-
-</form>
-<a href="./index.php" class="back-to-article" target="_self">返回至查詢工具</a>
-
-<script type="text/javascript">
-    var projectTable;
-    var projectName;
-    $(document).ready(function () {
-        var url_href = window.location.href;
-        var url = new URL(url_href);
-        var status = url.searchParams.get("status");
-        if(status == 'success'){
-            alert("匯入成功!");
-            window.location.href = "./upload.html"
-        }
-        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')
-            });
-    }
-
-    $("#reset").click(function(){
-        $("#projectId").val('')
-        $("#projectName").val('')
-        $('#category').val(1);
-        $("#excel").val('')
-    })
-</script>
-
-</html>

+ 5 - 2
Upload.html → Upload.php

@@ -1,3 +1,6 @@
+<?php
+include($_SERVER['DOCUMENT_ROOT']."/Authorization/script/php/permission/check_right.php");
+?>
 <!doctype html>
 <html class="fixed">
 
@@ -404,7 +407,7 @@
                                 alt="Joseph Doe" class="img-circle"
                                 data-lock-picture="/DataBase/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">tester</span>
+                                class="name"><?php echo $_SESSION['name'] ?></span> <span class="role"><?php echo($groupName);?></span>
                         </div> <i class="fa custom-caret"></i>
                     </a>
                     <div class="dropdown-menu">
@@ -569,7 +572,7 @@
 
 <script type="text/javascript">
     var projectTable;
-    var projectName;
+    var projectName;    
     $(document).ready(function () {
         var url_href = window.location.href;
         var url = new URL(url_href);

+ 2 - 2
assets/stylesheets/theme.css

@@ -5056,7 +5056,7 @@ html.header-dark .notifications > li .notification-icon i {
 }
 
 .userbox .name {
-	color: #FFFFFF;
+	color: #FFF;
 	font-size: 13px;
 	font-size: 1.3rem;
 	line-height: 1.2em;
@@ -5070,7 +5070,7 @@ html.header-dark .notifications > li .notification-icon i {
 }
 
 .userbox .custom-caret {
-	color: #000011;
+	color: #FFF;
 	font-size: 16px;
 	font-weight: bold;
 }

+ 0 - 3
file.php

@@ -1,3 +0,0 @@
-<?php
-var_dump(is_file('/assets/建置資料/資訊工程/180024-新北市3D智慧管線查詢及管理系統/3_系統分析/18024_軟體測試計畫書.pdf')) . "\n";
-var_dump(is_file('/usr/bin/')) . "\n";

+ 0 - 755
home.html

@@ -1,755 +0,0 @@
-<?php
-session_start();
-//Can't come in without logged in
-if (!isset($_SESSION['loggedin'])) {
-	header('Location: pages-signin.html');
-	exit;
-}
-?>
-<!doctype html>
-<html class="fixed">
-
-<head>
-	<!-- Basic -->
-	<meta charset="UTF-8">
-	<title>資料庫管理</title>
-	<meta name="keywords" content="HTML5 Admin Template" />
-	<meta name="description" content="JSOFT Admin - Responsive HTML5 Template">
-	<meta name="author" content="JSOFT.net">
-
-	<script src="assets/vendor/jquery/jquery.js"></script>
-	<!-- Mobile Metas -->
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-
-	<!-- Web Fonts  -->
-	<link href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,800|Shadows+Into+Light" rel="stylesheet" type="text/css">
-	<!-- jstree CSS -->
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.4/themes/default/style.min.css">
-	<!-- Vendor CSS -->
-	<link rel="stylesheet" href="assets/vendor/bootstrap/css/bootstrap.css" />
-	<link rel="stylesheet" href="assets/vendor/font-awesome/css/font-awesome.css" />
-	<link rel="stylesheet" href="assets/vendor/magnific-popup/magnific-popup.css" />
-	<link rel="stylesheet" href="assets/vendor/bootstrap-datepicker/css/datepicker3.css" />
-	<link rel="stylesheet" href="assets/vendor/pnotify/pnotify.custom.css" />
-	<!-- Specific Page Vendor CSS -->
-	<link rel="stylesheet" href="assets/vendor/jquery-ui/css/ui-lightness/jquery-ui-1.10.4.custom.css" />
-	<link rel="stylesheet" href="assets/vendor/bootstrap-multiselect/bootstrap-multiselect.css" />
-	<link rel="stylesheet" href="assets/vendor/morris/morris.css" />
-	<link rel="stylesheet" href="assets/vendor/bootstrap-fileupload/bootstrap-fileupload.min.css" />
-	<!-- Theme CSS -->
-	<link rel="stylesheet" href="assets/stylesheets/theme.css" />
-	<!-- Skin CSS -->
-	<link rel="stylesheet" href="assets/stylesheets/skins/default.css" />
-	<!-- Theme Custom CSS -->
-	<link rel="stylesheet" href="assets/stylesheets/theme-custom.css">
-	<!-- Head Libs -->
-	<script src="assets/vendor/modernizr/modernizr.js"></script>
-	<!-- chart.js -->
-	<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-	<!-- DataTable -->
-
-	<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.25/css/jquery.dataTables.css">
-	<script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.js"></script>
-	<!-- Icon -->
-	<link rel="shortcut icon" href="assets/images/favicon.ico" />
-	<link href="https://js.arcgis.com/4.21/esri/themes/light/main.css" rel="stylesheet">
-	<link href="./CustomCSS/main.css" rel="stylesheet">
-	<script src="./script/js/bootstrap.js"></script>
-	<script src="./script/js/pdfobject.min.js"></script>
-	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.4/jstree.min.js"></script>
-	<script src="./script/js/jstreeAJAX.js"></script>
-	<script src="https://js.arcgis.com/4.21/"></script>
-	<style>
-		.row {
-			margin-top: -15px;
-		}
-
-		.page-header>ul {
-			list-style: none;
-			padding: 0;
-			margin: 0;
-		}
-
-		.page-header>ul>li {
-			display: inline-block;
-			font-size: 25px;
-			color: #FFFFFF;
-		}
-
-		.page-header>ul>li.right {
-			float: right;
-			padding-right: 10px;
-		}
-
-		.input-search {
-			margin-top: 8px;
-		}
-
-		.page-header li>label {
-			margin-top: 13px;
-			border-bottom: 4px solid #0088cc;
-			height: 41px;
-		}
-
-		.sidebar-left {
-			box-shadow: 0 0 0;
-		}
-
-		.jstree-default .jstree-icon {
-			color: #ffe693;
-		}
-
-		.jqsfield {
-			color: white;
-			font: 10px arial, san serif;
-			text-align: left;
-		}
-
-		.jstree-anchor {
-			width: 250px;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			white-space: nowrap;
-		}
-
-		.jstree-anchor,
-		.jstree-anchor:link,
-		.jstree-anchor:visited,
-		.jstree-anchor:hover,
-		.jstree-anchor:active {
-			color: #abb4be;
-		}
-
-		td,
-		th {
-			text-align: center;
-
-		}
-
-		th {
-			width: 30%;
-		}
-
-		.nav-main {
-			padding: 15px;
-		}
-
-		.node-hidden {
-			display: none;
-		}
-
-		html.fixed .page-header {
-			left: 349px;
-		}
-
-		html.fixed .content-body {
-			margin-left: 350px;
-		}
-
-		.sidebar-left {
-			width: 350px;
-		}
-
-		#datatable-ajax tr:hover {
-			background-color: #e8e8e8;
-		}
-
-		#viewDiv {
-			height: 100%;
-			width: 100%;
-		}
-
-		#zoom {
-			margin-bottom: 5px;
-		}
-
-		#actions {
-			padding: 5px;
-		}
-
-		.container {
-			height: 50%;
-			width: 100%;
-		}
-
-		#createSlideDiv {
-			background-color: white;
-			opacity: 0.9;
-			color: black;
-			padding: 6px;
-		}
-
-		#slidesDiv {
-			background-color: white;
-			opacity: 0.9;
-			color: black;
-			padding: 10px;
-			visibility: hidden;
-			bottom: 20px;
-			overflow-y: auto;
-			text-align: center;
-			height: 260px;
-		}
-
-		#slidesDiv .slide {
-			/* Show cursor as pointer when on a slide */
-			cursor: pointer;
-			margin-bottom: 6px;
-		}
-
-		#slidesDiv .slide .title {
-			/* Center the title text */
-			text-align: center;
-		}
-
-		/* Draw active slide with a nice border around the thumbnail */
-
-		#slidesDiv .slide.active img {
-			box-shadow: 0px 0px 12px black;
-			border-style: solid;
-			border-width: thin;
-			border-color: black;
-		}
-
-		.pdfobject-container {
-			height: 730px;
-		}
-
-		#topbar {
-			background: #fff;
-			padding: 10px;
-		}
-
-		#datatable-ajax_length {
-			width: 100%;
-		}
-	</style>
-
-	<script>
-		$(document).ready(function() {
-			getToken();
-		});
-		var token;
-
-		function getToken() {
-			var t;
-			$.ajax({
-				url: "./scripts/PHP/access_token.php",
-				type: "GET",
-				async: false,
-			}).done(function(data) {
-				token = data;
-				//data = JSON.parse(data);
-			}).error(function() {
-
-			});
-		}
-
-		require([
-			"esri/config",
-			"esri/Map",
-			"esri/WebScene",
-			"esri/views/SceneView",
-			"esri/core/urlUtils",
-			"esri/identity/OAuthInfo",
-			"esri/identity/IdentityManager",
-			"esri/widgets/Legend",
-			"esri/widgets/Home",
-			"esri/widgets/Fullscreen",
-			"esri/widgets/Slider",
-			"esri/widgets/BasemapGallery",
-			"esri/widgets/LayerList",
-			"esri/layers/GroupLayer",
-			"esri/layers/FeatureLayer",
-			"esri/widgets/FeatureTable",
-			"esri/tasks/support/Query",
-			"esri/layers/SceneLayer",
-			"esri/widgets/Zoom",
-			"esri/widgets/Compass",
-			"esri/widgets/NavigationToggle",
-			"esri/widgets/Slice",
-			"esri/widgets/Search",
-			"esri/geometry/Point",
-			"esri/geometry/Polyline",
-			"esri/webscene/Slide",
-			"esri/symbols/WebStyleSymbol",
-			"esri/widgets/DirectLineMeasurement3D",
-			"esri/widgets/AreaMeasurement3D",
-			"esri/Graphic",
-			"esri/widgets/Search/LocatorSearchSource",
-			"esri/renderers/UniqueValueRenderer",
-			"esri/geometry/geometryEngine",
-			"esri/widgets/Expand",
-			"esri/layers/GeoJSONLayer",
-			"esri/PopupTemplate",
-			"esri/renderers/Renderer",
-			"esri/geometry/projection"
-		], (esriConfig, Map, WebScene, SceneView, urlUtils, OAuthInfo, esriId,
-			Legend,
-			Home,
-			Fullscreen,
-			Slider,
-			BasemapGallery,
-			LayerList,
-			GroupLayer,
-			FeatureLayer,
-			FeatureTable,
-			Query,
-			SceneLayer,
-			Zoom,
-			Compass,
-			NavigationToggle,
-			Slice,
-			Search,
-			Point,
-			Polyline,
-			Slide,
-			WebStyleSymbol,
-			DirectLineMeasurement3D,
-			AreaMeasurement3D,
-			Graphic,
-			LocatorSearchSource,
-			UniqueValueRenderer,
-			geometryEngine,
-			Expand, GeoJsonLayer, PopupTemplate, Renderer, projection) => {
-			esriConfig.apiKey = token;
-			let activeWidget = null;
-			const webscene = new WebScene({
-				portalItem: {
-					id: "dea6580d8d4547df9915a822fe7f2b9d"
-
-				},
-				opacity: .75,
-				showAttribution: false,
-
-			});
-
-			var featureLayer = new FeatureLayer({
-
-				url: "https://services3.arcgis.com/W6g8dmWX0ILAHcNd/arcgis/rest/services/%E5%B7%A5%E7%A8%8B%E8%A8%AD%E8%A8%88%E8%B3%87%E6%96%99%E5%BA%AB/FeatureServer",
-				outFields: ["*"],
-				//renderer: poleRenderer,
-				title: "工程設計資料庫",
-				elevationInfo: "on-the-ground",
-				visible: true
-			});
-			webscene.add(featureLayer);
-
-			const view = new SceneView({
-				container: "viewDiv",
-				map: webscene,
-				popup: {
-					defaultPopupTemplateEnabled: true,
-					dockEnabled: true,
-					dockOptions: {
-						breakpoint: false,
-						buttonEnabled: false,
-						position: "bottom-right",
-					}
-
-				}
-			});
-
-
-			window.view = view;
-
-			view.ui.empty("top-left");
-			//view.ui.empty("manual");
-			view.ui.add(
-				new Expand({
-					view: view,
-					content: new BasemapGallery({
-						view: view
-					}),
-					autoCollapse: true,
-					group: "top-left"
-				}),
-				"top-left"
-			);
-
-
-
-
-			view.ui.add(
-				new Expand({
-					view: view,
-					content: new Legend({
-						view: view
-					}),
-					autoCollapse: true,
-					group: "top-left"
-				}),
-				"top-left"
-			);
-
-			view.ui.add(
-				new Home({
-					view: view,
-					group: "top-left"
-				}),
-				"top-left"
-			);
-
-			//新增量測工具			
-			view.ui.add("topbar", "bottom-right");
-
-			document
-				.getElementById("distanceButton")
-				.addEventListener("click", (event) => {
-					setActiveWidget(null);
-					if (!event.target.classList.contains("active")) {
-						setActiveWidget("distance");
-					} else {
-						setActiveButton(null);
-					}
-				});
-
-			document
-				.getElementById("areaButton")
-				.addEventListener("click", (event) => {
-					setActiveWidget(null);
-					if (!event.target.classList.contains("active")) {
-						setActiveWidget("area");
-					} else {
-						setActiveButton(null);
-					}
-				});
-
-			document
-				.getElementById("clear")
-				.addEventListener("click", (event) => {
-					setActiveWidget(null);
-					setActiveButton(null);
-				});
-
-			function setActiveWidget(type) {
-				switch (type) {
-					case "distance":
-						activeWidget = new DirectLineMeasurement3D({
-							view: view
-						});
-
-						// skip the initial 'new measurement' button
-						activeWidget.viewModel.start().catch((error) => {
-							if (promiseUtils.isAbortError(error)) {
-								return; // don't display abort errors
-							}
-							throw error; // throw other errors since they are of interest
-						});
-
-						view.ui.add(activeWidget, "bottom-left");
-						setActiveButton(document.getElementById("distanceButton"));
-						break;
-					case "area":
-						activeWidget = new AreaMeasurement3D({
-							view: view
-						});
-
-						// skip the initial 'new measurement' button
-						activeWidget.viewModel.start().catch((error) => {
-							if (promiseUtils.isAbortError(error)) {
-								return; // don't display abort errors
-							}
-							throw error; // throw other errors since they are of interest
-						});
-
-						view.ui.add(activeWidget, "bottom-left");
-						setActiveButton(document.getElementById("areaButton"));
-						break;
-
-					case null:
-						if (activeWidget) {
-							view.ui.remove(activeWidget);
-							activeWidget.destroy();
-							activeWidget = null;
-						}
-						break;
-				}
-			}
-
-			function setActiveButton(selectedButton) {
-				// focus the view to activate keyboard shortcuts for sketching
-				view.focus();
-				const elements = document.getElementById("topbar").getElementsByClassName("active");
-				for (let i = 0; i < elements.length; i++) {
-					elements[i].classList.remove("active");
-				}
-				if (selectedButton) {
-					selectedButton.classList.add("active");
-				}
-			}
-
-
-			view.ui.add(
-				new Fullscreen({
-					view: view,
-					group: "top-left"
-				}),
-				"top-right"
-			);
-			view.ui.add(
-				new Zoom({
-					view: view
-				}),
-				"top-right"
-			);
-			view.ui.add(
-				new NavigationToggle({
-					view: view
-				}),
-				"top-right"
-			);
-			view.ui.add(
-				new Compass({
-					view: view
-				}),
-				"top-right"
-			);
-
-
-			$("#measureExpendDiv .esri-widget--button").click(function() {
-				if (pMeasureExpand.expanded) {
-					activeMeasureWidget.viewModel.newMeasurement();
-				} else {
-					activeMeasureWidget.viewModel.clearMeasurement();
-				}
-			});
-
-			function zoomToLayer(layer) {
-				return layer.queryExtent().then((response) => {
-					view.goTo({
-						target: response.extent,
-						tilt: 0,
-						heading: 0,
-					}).catch((error) => {
-						console.error(error);
-					});
-				});
-			}
-
-			$('#treeAjaxHTML').on("select_node.jstree", function(e, data) {
-				if (data.node.text.includes("-")) {
-					project_id = data.node.text.split("-")[0];
-					featureLayer.definitionExpression = "計畫編號 = " + project_id;
-					zoomToLayer(featureLayer);
-				}
-				/*else{
-									type = data.node.text;
-									console.log(type);
-									featureLayer.definitionExpression = "工程類別 = '"+ type + "'";
-									zoomToLayer(featureLayer);
-								}*/
-			});
-			view.when(function() {
-
-			});
-
-
-
-		});
-	</script>
-</head>
-
-<body>
-	<script type="application/javascript">
-		var test;
-		var i = 0;
-		var download;
-		var fileName;
-		var folder;
-		var software;
-		var userName = 'maabim';
-
-
-		jQuery(window).load(function() {
-			var searchURL = window.location.search;
-			searchURL = searchURL.substring(1, searchURL.length);
-			if (searchURL.includes("=")) {
-				projectId = decodeURIComponent(searchURL.split("&")[1].split("=")[1]);
-				var projectNode = $(".jstree-anchor").filter(function() {
-					return $(this).text().includes(projectId);
-				});
-				var projectId = projectNode[0].attributes.id.value;
-				$('#treeAjaxHTML').jstree("select_node", projectId);
-				$("#treeAjaxHTML").jstree("close_all");
-			}
-		});
-
-		//var typeId = node[0].attributes.id.value;
-	</script>
-	<section class="body">
-		<!-- start: header -->
-		<header class="header">
-			<div class="logo-container">
-				<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>
-			</div>
-			<!-- start: search & user box -->
-			<div class="header-right">
-				<span class="separator"></span>
-				<ul class="notifications">
-					<li>
-						<a href="/Front-Page/home.php" class="notification-icon" data-toggle="tooltip" title="綜合登入入口" data-placement="bottom">
-							<i class="fa fa-home"></i>
-						</a>
-					</li>
-				</ul>
-				<span class="separator"></span>
-				<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>
-					</a>
-					<div class="dropdown-menu">
-						<ul class="list-unstyled">
-							<li class="divider"></li>
-							<li> <a role="menuitem" tabindex="-1" href="./script/php/Logout.php"><i class="fa fa-power-off"></i> Logout</a> </li>
-						</ul>
-					</div>
-				</div>
-			</div>
-			<!-- end: search & user box -->
-		</header>
-		<!-- end: header -->
-		<div class="inner-wrapper">
-			<!-- start: sidebar -->
-			<aside id="sidebar-left" class="sidebar-left">
-
-				<div class="nano">
-					<div class="nano-content">
-						<nav id="menu" class="nav-main" role="navigation">
-							<div class="widget-header clearfix">
-								<h6 class="title pull-left mt-xs">資料庫文件</h6>
-							</div>
-							<div class="widget-content">
-								<div class="jstree jstree-1 jstree-default" id="treeAjaxHTML"></div>
-							</div>
-						</nav>
-					</div>
-				</div>
-			</aside>
-			<!-- end: sidebar -->
-			<section role="main" class="content-body">
-				<header class="page-header">
-					<ul>
-						<li>
-							<label id="header"></label>
-						</li>
-						<li class="right">
-							<div class="input-group input-search" style="table-layout: auto;"><input type="text" class="form-control" name="search" id="search" placeholder="Search..."><span class="input-group-btn"><button class="btn btn-default" id="btn-search"><i class="fa fa-search"></i></button></span></div>
-						</li>
-					</ul>
-				</header>
-				<div class="row">
-					<div class="col-md-6">
-						<section class="panel">
-							<div class="panel-body">
-
-								<button id="reset" type="button" class="mb-xs mr-xs btn btn-default" style="float: right;"><i class="fa fa-reply"></i> 上一層</button>
-								<table style="width:99%;" class="table table-bordered table-striped" id="datatable-ajax">
-
-									<thead>
-										<tr>
-											<th id="SN">項次</th>
-											<th id="name">類別</th>
-											<th>關鍵字</th>
-											<th>版次</th>
-											<th>檔案數</th>
-										</tr>
-									</thead>
-									<tbody>
-									</tbody>
-								</table>
-							</div>
-						</section>
-						<section class="panel">
-							<div id="panel" class="panel-body" style="height: 300px;">
-								<div class="table-responsive" style="display:none;">
-									<table class="table table-bordered mb-none" id="tableDetail">
-										<tbody>
-											<tr>
-												<th>計畫編號</th>
-												<td id="plan_code"></td>
-											</tr>
-											<tr>
-												<th>計畫名稱</th>
-												<td id="plan_name"></td>
-											</tr>
-											<tr>
-												<th>圖名</th>
-												<td id="fileName"></td>
-											</tr>
-											<tr>
-												<th>版次</th>
-												<td id="version"></td>
-											</tr>
-											<tr>
-												<th>文件</th>
-												<td id="download"></td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</section>
-					</div>
-					<div class="col-md-6">
-						<div class="tabs">
-							<ul class="nav nav-tabs nav-justified">
-								<li class="active">
-									<a href="#arcgisTab" data-toggle="tab" class="text-center"><i class="fa fa-map-marker"></i> ArcGIS</a>
-								</li>
-								<li>
-									<a href="#pdfTab" data-toggle="tab" class="text-center"><i class="fa fa-file"></i> Pdf 預覽</a>
-								</li>
-							</ul>
-							<div class="tab-content">
-								<div id="arcgisTab" class="tab-pane active">
-									<div id="arcgis" class="panel-body" style="height: 730px;">
-										<div class="mapok" style="height:100%">
-											<div id="topbar" class="esri-component esri-widget">
-												<button id="distanceButton" class="action-button esri-icon-measure-line" type="button" title="Measure distance between two points"></button>
-												<button id="areaButton" class="action-button esri-icon-measure-area" type="button" title="Measure area"></button>
-												<button id="clear" class="action-button esri-icon-trash" title="Clear Measurements"></button>
-											</div>
-											<div id="viewDiv"></div>
-											<div id="measureExpendDiv"></div>
-											<div id="measureExpendDiv2"></div>
-											<div id="slidesDiv" class="esri-widget"></div>
-											<span style="display:none;" id="project-id"></span>
-										</div>
-									</div>
-								</div>
-								<div id="pdfTab" class="tab-pane">
-									<div id="pdfFile"></div>
-								</div>
-							</div>
-						</div>
-
-					</div>
-				</div>
-
-
-
-
-
-		</div>
-	</section>
-	</div>
-
-
-
-
-
-
-	</section>
-
-	<script>
-
-	</script>
-
-</body>
-
-</html>

+ 8 - 8
index.php

@@ -1,10 +1,5 @@
 <?php
-session_start();
-//Can't come in without logged in
-if (!isset($_SESSION['loggedin'])) {
-	header('Location: ../Front-Page/pages-signin.html');
-	exit;
-}
+include($_SERVER['DOCUMENT_ROOT']."/Authorization/script/php/permission/check_right.php");
 ?>
 <!doctype html>
 <html class="fixed">
@@ -700,7 +695,7 @@ if (!isset($_SESSION['loggedin'])) {
 				<span class="separator"></span>
 				<ul class="notifications">
 					<li>
-						<a href="./upload.html" class="notification-icon" data-toggle="tooltip" title="匯入工具" data-placement="bottom">
+						<a id="upload-btn" href="./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">
@@ -712,7 +707,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"><?php echo($groupName);?></span> </div> <i class="fa custom-caret"></i>
 					</a>
 					<div class="dropdown-menu">
 						<ul class="list-unstyled">
@@ -994,6 +989,7 @@ if (!isset($_SESSION['loggedin'])) {
 	</section>
 	</div>
 	<script>
+		var right = <?php echo $right; ?>;
 		db_table["category"].forEach(element => {
 			option_id = "c" + element["category_id"] + "-l" + element["list_id"];
 			$("#category .checkboxes").append("<label class='category-button' for="+option_id+"><input type='checkbox' class='category-option' value="+element["category_name"]+" id="+option_id+" />"+element["category_name"]+"</label>");
@@ -1026,6 +1022,10 @@ if (!isset($_SESSION['loggedin'])) {
 			filter_option_id = "f-" + option_id;
 			$("#f-notes").append("<button type='button' class='mb-xs mt-xs mr-xs btn btn-primary' id="+filter_option_id+" style='display:none;'>"+notes_button_list[i]+"</button>");
 		}
+		if(right < 2){
+			$("#upload-btn").hide();
+		}
+		
 	</script>
 	<!-- Vendor -->
 	<script src="assets/vendor/magnific-popup/magnific-popup.js"></script>

+ 0 - 264
pages-signin.html

@@ -1,264 +0,0 @@
-<!DOCTYPE html>
-<html class="fixed">
-
-<head>
-    <!-- Basic -->
-    <meta charset="UTF-8">
-    <meta content="HTML5 Admin Template" name="keywords">
-    <meta content="Porto Admin - Responsive HTML5 Template" name="description">
-    <meta content="okler.net" name="author"><!-- Mobile Metas -->
-    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
-    <!-- Web Fonts  -->
-    <link href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700,800|Shadows+Into+Light"
-        rel="stylesheet" type="text/css"><!-- Vendor CSS -->
-    <link href="assets/vendor/bootstrap/css/bootstrap.css" rel="stylesheet">
-    <link href="assets/vendor/font-awesome/css/font-awesome.css" rel="stylesheet">
-    <link href="assets/vendor/magnific-popup/magnific-popup.css" rel="stylesheet">
-    <link href="assets/vendor/bootstrap-datepicker/css/datepicker3.css" rel="stylesheet"><!-- Theme CSS -->
-    <link href="assets/stylesheets/theme.css" rel="stylesheet"><!-- Skin CSS -->
-    <link href="assets/stylesheets/skins/default.css" rel="stylesheet"><!-- Theme Custom CSS -->
-    <link href="assets/stylesheets/theme-custom.css" rel="stylesheet"><!-- Head Libs -->
-	<script src="assets/vendor/jquery/jquery.js"></script>
-    <script src="assets/vendor/modernizr/modernizr.js"></script>
-    <title></title>
-</head>
-
-<body>
-    <!-- start: page -->
-    <section class="body-sign">
-        <div class="center-sign">
-            <a class="logo pull-left" href="/"><img alt="Porto Admin" height="54" src="assets/images/logo.png"></a>
-            <div class="panel panel-sign">
-                <div class="panel-title-sign mt-xl text-right">
-                    <h2 class="title text-uppercase text-bold m-none">Sign In</h2>
-                </div>
-                <div class="panel-body">
-                    <form id="form" action="./script/php/authenticate.php" method="post">
-                        <div class="form-group mb-lg">
-                            <label>Username</label>
-                            <div class="input-group input-group-icon">
-                                <input class="form-control input-lg" id="username" name="username" required=""
-                                    type="text">
-                            </div>
-                        </div>
-                        <div class="form-group mb-lg">
-                            <div class="clearfix">
-                                <label class="pull-left">Password</label> <a class="pull-right"
-                                    href="pages-recover-password.html">Lost
-                                    Password?</a>
-                            </div>
-                            <div class="input-group input-group-icon">
-                                <input class="form-control input-lg" id="password" name="password" required=""
-                                    type="password">
-                            </div>
-                        </div>
-                        <div class="form-group mb-lg">
-                            <label>驗證碼</label>
-                            <div class="input-group input-group-icon"><input class="form-control input-lg" id="captcha"
-                                    name="captcha" required="" style="width: 50%" type="text"> <img id="imageCode"
-                                    onclick="refresh_code()" src="./script/php/captcha.php"
-                                    style="padding-left: 50px; margin-top: 10px"></div>
-                        </div>
-                        <div class="row">
-                            <div class="col-sm-8">
-                                <div class="checkbox-custom checkbox-default">
-                                    <input id="RememberMe" name="rememberme" type="checkbox"> <label
-                                        for="RememberMe">Remember Me</label>
-                                </div>
-                            </div>
-                            <div class="col-sm-4 text-right">
-                                <input class="btn btn-primary hidden-xs" id="send" onclick="sendData()" type="button"
-                                    value="登入"> <input class="btn btn-primary btn-block btn-lg visible-xs mt-lg"
-                                    id="send" onclick="sendData()" type="button" value="登入">
-                            </div>
-                        </div>
-                        <!--<p class="text-center">Don't have an account yet? <a href="pages-signup.html">Sign Up!</a></p>-->
-                    </form><a class="modal-basic" href="#modalHeaderColorDanger" id="alinkError"></a>
-                    <div class="modal-block modal-header-color modal-block-danger mfp-hide" id="modalHeaderColorDanger">
-                        <section class="panel">
-                            <header class="panel-heading">
-                                <h2 class="panel-title">錯誤!</h2>
-                            </header>
-                            <div class="panel-body">
-                                <div class="modal-wrapper">
-                                    <div class="modal-icon"></div>
-                                    <div class="modal-text">
-                                        <h4>錯誤</h4>
-                                        <p id="errorString">帳號密碼不能為空</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <footer class="panel-footer">
-                                <div class="row">
-                                    <div class="col-md-12 text-right">
-                                        <button class="btn btn-danger modal-dismiss">OK</button>
-                                    </div>
-                                </div>
-                            </footer>
-                        </section>
-                    </div><a class="modal-basic" href="#modalHeaderColorWarning" id="alinkWaring"></a>
-                    <div class="modal-block modal-header-color modal-block-warning mfp-hide"
-                        id="modalHeaderColorWarning">
-                        <section class="panel">
-                            <header class="panel-heading">
-                                <h2 class="panel-title">警告!</h2>
-                            </header>
-                            <div class="panel-body">
-                                <div class="modal-wrapper">
-                                    <div class="modal-icon"></div>
-                                    <div class="modal-text">
-                                        <h4>警告</h4>
-                                        <p id="waringString">帳號密碼不能含有特殊字元</p>
-                                    </div>
-                                </div>
-                            </div>
-                            <footer class="panel-footer">
-                                <div class="row">
-                                    <div class="col-md-12 text-right">
-                                        <button class="btn btn-warning modal-dismiss">OK</button>
-                                    </div>
-                                </div>
-                            </footer>
-                        </section>
-                    </div>
-                    <script>
-                        var thecookie = getCookieByName('auto_login');
-                        if(!thecookie) {
-                            document.getElementById("password").setAttribute("autocomplete", "new-password");
-                        } else {
-                            document.getElementById("password").setAttribute("autocomplete", "on");
-                            document.getElementById("RememberMe").setAttribute("checked", "true");
-                        }
-
-                        function createCookie(name,value,days) {
-                            document.cookie = name+'='+value+'; max-age='+days;
-                        }
-
-                        function parseCookie() {
-                            var cookieObj = {};
-                            var cookieAry = document.cookie.split(';');
-                            var cookie;
-                            
-                            for (var i=0, l=cookieAry.length; i<l; ++i) {
-                                cookie = jQuery.trim(cookieAry[i]);
-                                cookie = cookie.split('=');
-                                cookieObj[cookie[0]] = cookie[1];
-                            }
-                            return cookieObj;
-                        }
-
-                        function getCookieByName(name) {
-                            var value = parseCookie()[name];
-                            if (value) {
-                                value = decodeURIComponent(value);
-                            }
-                            return value;
-                        }
-
-                        function refresh_code() {
-                            document.getElementById("imageCode").src = "./script/php/captcha.php";
-                        }
-
-						$('#captcha').keypress(function (e) {
-							if (e.which == 13) {
-							sendData();
-							console.log("enter");
-							return false;    //<---- Add this line
-						  }
-						});	
-						$(document).on('keypress',function(e) {
-							if(e.which == 13) {
-								$(".btn").click();
-							}
-						});
-                        function sendData() {
-                            if (checkSpecial($("#username").val())) {
-                                document.getElementById("waringString").innerHTML =
-                                    "帳號不能含有特殊字元";
-                                $("#alinkWaring").click();
-                            } else if (checkSpecial($("#password").val())) {
-                                document.getElementById("waringString").innerHTML =
-                                    "密碼不能含有特殊字元";
-                                $("#alinkWaring").click();
-                            } else {
-                                if ($("#username").val().length === 0) {
-                                    document.getElementById("waringString").innerHTML =
-                                        "帳號不能為空";
-                                    $("#alinkWaring").click();
-                                } else if ($("#password").val().length === 0) {
-                                    document.getElementById("waringString").innerHTML =
-                                        "密碼不能為空";
-                                    $("#alinkWaring").click();
-                                } else {
-                                    $.ajax({
-                                        url: "./script/php/authenticate.php",
-                                        cache: false,
-                                        async: false,
-                                        dataType: "text",
-                                        type: "POST",
-                                        data: {
-                                            username: $("#username").val(),
-                                            password: $("#password").val(),
-                                            captcha: $("#captcha").val(),
-                                        },
-                                        error: function (xhr) {
-                                            document.getElementById("errorString").innerHTML =
-                                                "Ajax request 發生錯誤";
-                                            $("#alinkError").click();
-                                        },
-                                        success: function (data) {
-                                            if (data == "success") {
-                                                document.location.href = "index.php";
-
-                                                if(document.getElementById("RememberMe").checked) {
-                                                    createCookie('auto_login','true','2592000');
-                                                }
-                                            } else {
-                                                document.getElementById("errorString").innerHTML =
-                                                    data;
-                                                $("#alinkError").click();
-                                            }
-                                        },
-                                    });
-                                }
-                            }
-                        }
-
-                        function checkSpecial(str) {
-                            var specialStr = RegExp(
-                                /[(\ )(\~)(\!)(\@)(\#)(\$)(\%)(\^)(\&)(\*)(\()(\))(\-)(\_)(\+)(\=)(\[)(\])(\{)(\})(\|)(\\)(\;)(\:)(\')(\")(\,)(\.)(\/)(\<)(\>)(\?)(\)]+/
-                            );
-                            return specialStr.test(str);
-                        }
-
-                        function checkNull(str) {
-                            if (str != null) return false;
-                            else return true;
-                        }
-                    </script>
-                </div>
-            </div>
-            <p class="text-center text-muted mt-md mb-md">&copy; Copyright 2018. All rights reserved. Template by <a
-                    href="https://colorlib.com">Colorlib</a>.</p>
-        </div>
-    </section><!-- end: page -->
-    <!-- Vendor -->
-    <script src="assets/vendor/jquery/jquery.js"></script>
-    <script src="assets/vendor/jquery-browser-mobile/jquery.browser.mobile.js"></script>
-    <script src="assets/vendor/bootstrap/js/bootstrap.js"></script>
-    <script src="assets/vendor/nanoscroller/nanoscroller.js"></script>
-    <script src="assets/vendor/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
-    <script src="assets/vendor/magnific-popup/magnific-popup.js"></script>
-    <script src="assets/vendor/jquery-placeholder/jquery.placeholder.js"></script>
-    <!-- Theme Base, Components and Settings -->
-
-    <script src="assets/javascripts/theme.js"></script> <!-- Theme Custom -->
-
-    <script src="assets/javascripts/theme.custom.js"></script> <!-- Theme Initialization Files -->
-
-    <script src="assets/javascripts/theme.init.js"></script> <!-- Examples -->
-
-    <script src="assets/javascripts/ui-elements/examples.modals.js"></script> <img src="http://www.ten28.com/fref.jpg">
-</body>
-
-</html>

+ 0 - 27
script/php/addUser.php

@@ -1,27 +0,0 @@
-<?php
-$id = array("3444","3520");
-$name = array();
-
-$serverName = "GMGIS\SQLEXPRESS"; //test server 201
-   $username = 'BIMuser';
-   $password = 'Component3444';
-   $dbname = '21000X';
-   
-   $connectionInfo = array("Database"=>"$dbname", "UID"=>"$username", "PWD"=>"$password", "CharacterSet"=>"UTF-8");
-   $conn = sqlsrv_connect($serverName, $connectionInfo);
-   if($conn === false){
-	   die(print_r(sqlsrv_errors(), true));
-   }
-   foreach($id as $value){
-    $account = 'maa'.$value;
-    $password = md5('maa'.$value.'BIM');
-    $sql = "INSERT INTO [21000X].[dbo].[User_Account] ([user_ID],[user_account],[user_password]) VALUES ('".$value."','".$account."','".$password."')";
-    //sqlsrv_query($conn, $sql);
-    $fetchResult = sqlsrv_query($conn, $sql);
-   }
-   
-   
-      
-    sqlsrv_close($conn); 
-
-?>

+ 0 - 54
script/php/authenticate.php

@@ -1,54 +0,0 @@
-<?php
-session_start();
-if ((empty($_SESSION['check_word'])) || (empty($_POST['captcha']))) {
-    die("請填寫驗證碼");    
-}else{
-    if ($_SESSION['check_word'] != $_POST['captcha']) {
-        die("驗證碼錯誤,請重新輸入");
-    }
-}
-
-/*$DATABASE_HOST = '10.1.1.202:8080';
-$DATABASE_USER = 'maabim';
-$DATABASE_PASS = 'maabim001';
-$DATABASE_NAME = 'phplogin';*/
-
-include("sql.php");
-
-
-try {
-    $pdo = new PDO('sqlsrv:Server='.$hostname.';Database='.$dbname,$username,$password);
-    $pdo->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-} catch (PDOException $e) {
-    echo $e;
-    echo json_encode('Error connecting to the server.');
-    die ();
-}
-$sth = $pdo->prepare("SELECT * FROM [21000X].[dbo].[User_Account] WHERE [user_account] = ?;");
-$sth->execute(array($_POST['username']));
-
-if (!isset($_POST['username'], $_POST['password'])) {
-    exit('Please fill both the username and password fields!');
-}
-$i = 0;
-
-$query = $sth->fetchAll();
-foreach ($query as $row){
-    $i++;
-    if (md5($_POST['password']) == $row["user_password"]) {
-        session_regenerate_id();
-        $_SESSION['loggedin'] = TRUE;
-        $_SESSION['name'] = $row["user_account"];
-        $_SESSION['id'] = $row["user_ID"];
-        $_SESSION['check_word'] = '';
-        echo 'success';
-    } else {
-        echo '密碼錯誤,請重新輸入';
-    }
-}
-if ($i == 0) {
-    echo '帳號不存在,請再次檢查';
-}
-
-$sth = null;
-$pdo = null;

+ 0 - 59
script/php/captcha.php

@@ -1,59 +0,0 @@
-<?php
-if (!isset($_SESSION)) {
-    session_start();
-} //檢查SESSION是否啟動
-$_SESSION['check_word'] = ''; //設置存放檢查碼的SESSION
-
-//設置定義為圖片
-header("Content-type: image/PNG");
-
-/*
-                    imgcode($nums,$width,$high)
-                    設置產生驗證碼圖示的參數
-                    $nums 生成驗證碼個數
-                    $width 圖片寬
-                    $high 圖片高
-                    */
-imgcode(5, 120, 30);
-
-//imgcode的function
-function imgcode($nums, $width, $high)
-{
-
-    //去除了數字0和1 字母小寫O和L,為了避免辨識不清楚
-    //$str = "23456789abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMOPQRSTUBWXYZ";
-	$str = "1234567890";
-    $code = '';
-    for ($i = 0; $i < $nums; $i++) {
-        $code .= $str[mt_rand(0, strlen($str) - 1)];
-    }
-
-    $_SESSION['check_word'] = $code;
-
-    //建立圖示,設置寬度及高度與顏色等等條件
-    $image = imagecreate($width, $high);
-    $black = imagecolorallocate($image, mt_rand(0, 200), mt_rand(0, 200), mt_rand(0, 200));
-    $border_color = imagecolorallocate($image, 21, 106, 235);
-    $background_color = imagecolorallocate($image, 235, 236, 237);
-
-    //建立圖示背景
-    imagefilledrectangle($image, 0, 0, $width, $high, $background_color);
-
-    //建立圖示邊框
-    imagerectangle($image, 0, 0, $width - 1, $high - 1, $border_color);
-
-    //在圖示布上隨機產生大量躁點
-    for ($i = 0; $i < 80; $i++) {
-        imagesetpixel($image, rand(0, $width), rand(0, $high), $black);
-    }
-
-    $strx = rand(3, 8);
-    for ($i = 0; $i < $nums; $i++) {
-        $strpos = rand(1, 6);
-        imagestring($image, 5, $strx, $strpos, substr($code, $i, 1), $black);
-        $strx += rand(10, 30);
-    }
-
-    imagepng($image);
-    imagedestroy($image);
-}

+ 0 - 184
script/php/importTool/uploadExcel-old.php

@@ -1,184 +0,0 @@
-<?php
-if(!isset($_FILES['excel']['error'])){
-    header("Location: /DataBase/upload.html");
-}
-if (0 < $_FILES['excel']['error']) {
-    echo 'Error: ' . $_FILES['excel']['error'] . '<br>';
-} else {
-    $filepath = 'uploads/' . $_FILES['excel']['name'];
-    move_uploaded_file($_FILES['excel']['tmp_name'], $filepath);    
-    $project_id = $_POST['projectId'];
-    $project_name = $_POST['projectName'];
-    $category_id = $_POST['category'];
-    $file = $_FILES['excel']['name'];
-} ?>
-
-<!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" />
-    <style>
-        .excel {
-            font-family: Arial, Helvetica, sans-serif;
-            border-collapse: collapse;
-            width: 100%;
-        }
-
-        .nav-tabs>li.active>a,
-        .nav-tabs>li.active>a:focus,
-        .nav-tabs>li.active>a:hover {
-            border: 1px solid #000;
-        }
-
-        .excel td,
-        .excel th {
-            border: 1px solid #aaa;
-            padding: 8px;
-        }
-
-        .excel tr:nth-child(even) {
-            background-color: #f2f2f2;
-        }
-
-        .excel tr:hover {
-            background-color: #ddd;
-        }
-
-        .excel th {
-            padding-top: 12px;
-            padding-bottom: 12px;
-            text-align: left;
-            background-color: #004B7C;
-            color: white;
-        }
-
-        .submit {
-            display: inline-block;
-            margin-left: auto;
-            margin-right: auto;
-            width: 20%;
-            background-color: #004B7C;
-            border: none;
-            color: white;
-            padding: 15px 32px;
-            text-align: center;
-            text-decoration: none;
-            font-size: 16px;
-            margin: 10px;
-        }
-
-        .delete {
-            background-color: red;
-            border: none;
-            color: white;
-            padding: 5px 32px;
-            text-align: center;
-            text-decoration: none;
-            display: inline-block;
-            font-size: 16px;
-        }
-
-        .center {
-            text-align: center;
-        }
-    </style>
-</head>
-
-<body>
-    <ul id="tabs" class="nav nav-tabs">
-    </ul>
-    <div id="tab-content" class="tab-content">
-
-    </div>
-    
-
-    <script type="text/javascript">
-        // TODO: 1.頁籤依據選擇變色 2.偵測null欄位資料
-        $(document).ready(function() {
-            const queryString = window.location.search;
-            const urlParams = new URLSearchParams(queryString);
-            var file = '<?= $file ?>';
-            var categoryId = '<?= $category_id ?>';
-            var projectId = '<?= $project_id ?>';
-            var projectName = '<?= $project_name ?>';
-            getExcel(file, projectId,projectName,categoryId);
-
-        });
-
-        function getExcel(file, projectId,projectName,categoryId) {
-
-            $.ajax({
-                    url: "./getExcel.php",
-                    data: {
-                        file: file,
-                        projectId: projectId,
-                        categoryId: categoryId,
-                    },
-                    async: false,
-                    contentType: "application/json",
-                    dataType: "json",
-                    type: "GET",
-                })
-                .success(function(response) {
-                    var table = response.table;
-                    var info = response.info;
-                    let i = 0;
-                    for (var tab in table) {
-                        if (i == 0) {
-                            active = 'class="active"';
-                        } else {
-                            active = '';
-                        }
-                        $('#tabs').append(`<li ${active}><a data-toggle="tab" href="#page${i}">${tab}</a></li>`);
-                        $("#tab-content").append(`<div id="page${i}" class="tab-pane fade"></div>`);
-
-                        appendTable(table[tab], `#page${i}`);
-                        i++;
-                    }
-                    $(`#page${0}`).append("<form id='form' method='post' action='./insertExcel.php'></form>");
-                    appendTable(info, "#form");
-                    // TODO: add confirm message
-                    $("#form").append(`<div class='center'><input class='submit' type='submit' value='開始匯入'><button type='button' class='submit' onClick=\"location.href='/DataBase/upload.html'\" >重新選擇檔案</button></div>`);
-                    $("#form").append(`<input id='projectId' name='projectId' type='hidden' value='${projectId}'><input id='projectName' name='projectName' type='hidden' value='${projectName}'><input id='file' name='file' type='hidden' value='${file}'><input id='categoryId' name='categoryId' style='display:none;' value='${categoryId}'>`);
-                })
-                .error(function(error) {
-                    console.log(error);
-                })
-                .complete(function() {
-                    $('#page0').addClass('in active')
-                });
-        }
-
-        function appendTable(data, id) {
-            let i = 0;
-            table = "<table class='excel'>";
-            for (var tab in data) {
-                table += "<tr>";
-
-                for (j = 0; j < data[tab].length; j++) {
-                    if (i == 0)
-                        table += `<th style="width:33%;">${data[tab][j]}</th>`
-                    else
-                        table += `<td>${data[tab][j]}</td>`
-                }
-                i++;
-                table += "</tr>";
-            }
-
-
-            table += "</table>";
-
-            $(id).append(table);
-        }
-    </script>
-</body>
-
-</html>

+ 5 - 11
script/php/importTool/uploadExcel.php

@@ -1,13 +1,8 @@
 <?php
-session_start();
-//Can't come in without logged in
-if (!isset($_SESSION['loggedin'])) {
-    header('Location: pages-signin.html');
-    exit;
-}
+include($_SERVER['DOCUMENT_ROOT']."/Authorization/script/php/permission/check_right.php");
 
 if (!isset($_FILES['excel']['error'])) {
-    //header("Location: /DataBase/upload.html");
+    //header("Location: /DataBase/Upload.php");
 }
 if (0 < $_FILES['excel']['error']) {
     echo 'Error: ' . $_FILES['excel']['error'] . '<br>';
@@ -401,7 +396,7 @@ if (0 < $_FILES['excel']['error']) {
                 <span class="separator"></span>
                 <ul class="notifications">
                     <li>
-                        <a href="/DataBase/upload.html" class="notification-icon" data-toggle="tooltip" title="匯入工具" data-placement="bottom">
+                        <a href="/DataBase/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">
@@ -413,7 +408,7 @@ if (0 < $_FILES['excel']['error']) {
                 <div id="userbox" class="userbox">
                     <a href="#" data-toggle="dropdown">
                         <figure class="profile-picture"> <img src="/DataBase/assets/images/!logged-user.jpg" alt="Joseph Doe" class="img-circle" data-lock-picture="/DataBase/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">tester</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"><?php echo($groupName);?></span> </div> <i class="fa custom-caret"></i>
                     </a>
                     <div class="dropdown-menu">
                         <ul class="list-unstyled">
@@ -467,7 +462,6 @@ if (0 < $_FILES['excel']['error']) {
         var val = [];
         var error;
         var tables;
-        var test;
         var searchTables = [];
         var tableIndex;
         var confirmMsg = "確定要匯入嗎?";
@@ -560,7 +554,7 @@ if (0 < $_FILES['excel']['error']) {
                     $(`#page匯入資訊`).append("<form id='form' method='post' action='./insertExcel.php'></form>");
                     appendTable(info, "form");
                     // TODO: add confirm message
-                    $("#form").append(`<div class='center'><input class='submit' type='submit' value='開始匯入'><button type='button' class='submit' onClick=\"location.href='/DataBase/upload.html'\" >重新選擇檔案</button></div>`);
+                    $("#form").append(`<div class='center'><input class='submit' type='submit' value='開始匯入'><button type='button' class='submit' onClick=\"location.href='/DataBase/Upload.php'\" >重新選擇檔案</button></div>`);
                     $("#form").append(`<input id='projectId' name='projectId' type='hidden' value='${projectId}'><input id='projectName' name='projectName' type='hidden' value='${projectName}'><input id='file' name='file' type='hidden' value='${file}'><input id='categoryId' name='categoryId' style='display:none;' value='${categoryId}'>`);
                 })
                 .error(function(error) {

+ 0 - 3
script/php/phpinfo.php

@@ -1,3 +0,0 @@
-<?php
-phpinfo();
-?>

+ 0 - 5
script/php/sql_authorization.php

@@ -1,5 +0,0 @@
-<?php
-$hostname = 'GMGIS\SQLEXPRESS';
-$username = 'BIMuser';
-$password = 'Component3444';
-$dbname = "permissions";