主程式新增判斷副檔名、 '\'轉'/'

匯入工具刪除新增類別改使用list判斷

assets/notPDF.pdf

@@ -0,0 +1 @@
+

script/js/jstreeAJAX.js

@@ -7,7 +7,7 @@ $(document).ready(function () {
     var project_name = '';
     var project = '';
     var blueprint_SN = '';
-    var blueprint_path = '';
+    var blueprint_path = '';    
     var notes = [];
     var tempTable = [];
     var tempTable2 = [];
@@ -174,14 +174,21 @@ $(document).ready(function () {
                     let i = 1;
                     table.clear().draw();
                     tempTable = [];
+                   
+                   
                     types.forEach(function (data) {
-
+                        console.log(data)
+                        if(fileNums[i-1] == null){
+                            total = 0;
+                        }else{
+                            total = fileNums[i-1].total;
+                        }
                         let temp = [
                             i,
                             data,
                             category,
                             '',
-                            fileNums[i - 1].total,
+                            total,
                             project,
 
                         ];
@@ -200,12 +207,17 @@ $(document).ready(function () {
                 tempTable = [];
                 countFiles(project_id, "false");
                 types.forEach(function (data) {
+                    if(fileNums[i-1] == null){
+                        total = 0;
+                    }else{
+                        total = fileNums[i-1].total;
+                    }
                     let temp = [
                         i,
                         data,
                         category,
                         '',
-                        fileNums[i - 1].total,
+                        total,
                         project,
                     ];
                     table.row.add(temp).draw();
@@ -355,18 +367,34 @@ $(document).ready(function () {
             let path = '';
             //let category = data[8];
             if (data[7] == 3) {
-                path = data[8] + "/" + data[5] + "-" + data[6] + "/" + data[7] + "_" + type + "/" + data[9] + "/" + data[10];
+                path = data[8] + "/" + data[5] + "-" + data[6] + data[10];
             } else {
-                path = data[8] + "/" + data[5] + "-" + data[6] + "/" + data[7] + "_" + type + "/" + data[10];
+                path = data[8] + "/" + data[5] + "-" + data[6] + data[10];
             }
 
             $("#plan_code").text(data[5]);
             $("#plan_name").text(data[6]);
-            $("#download").append('<img src="./assets/images/' + 'pdf-icon.png" style="height: 30px; display: inline-block;"> ');
-            $("#download").append('<a target="_blank" href="./assets/建置資料/' + path + '">' + data[10] + '</a>');
+            
+            
             $("#version").text(data[3]);
             $("#fileName").text(data[1]);
-            PDFObject.embed("./assets/建置資料/" + path, "#pdfFile");
+            if(path.toLowerCase().includes("pdf")){
+                PDFObject.embed("./assets/建置資料/" + path, "#pdfFile");
+                $("#download").append('<img src="./assets/images/' + 'pdf-icon.png" style="height: 30px; display: inline-block;"> ');
+            }else{                
+                PDFObject.embed("./assets/notPDF.pdf", "#pdfFile");
+                
+                if(path.toLowerCase().includes("doc")){
+                    $("#download").append('<img src="./assets/images/' + 'word-icon.png" style="height: 30px; display: inline-block;"> ');
+                }else if(path.toLowerCase().includes("xls")){
+                    $("#download").append('<img src="./assets/images/' + 'excel-icon.png" style="height: 30px; display: inline-block;"> ');
+                }
+                
+            }
+            console.log( data[10]);
+            let fileNames = data[10].split('/');
+            let fileName = fileNames[fileNames.length-1];
+            $("#download").append('<a target="_blank" href="./assets/建置資料/' + path + '">' + fileName + '</a>');
 
         }
 
@@ -382,21 +410,21 @@ $(document).ready(function () {
             $("#SN").text("圖號");
             $("#name").text("圖名");
             $('.nav-tabs a[href="#pdfTab"]').tab('show');
-            test = table;
-            if(table.rows().count()>10){
+            //test = table;
+            if (table.rows().count() > 10) {
                 table.page.len(10).draw();
-            }else{
+            } else {
                 table.page.len(-1).draw();
-            }      
+            }
         } else {
             $(".table-responsive").hide();
             $("#SN").text("項次");
             $("#name").text("類別");
-            if(isBlueprint){
+            if (isBlueprint) {
                 table.page.len(-1).draw();
-            }else{
+            } else {
                 table.page.len(7).draw();
-            }            
+            }
             $('.nav-tabs a[href="#arcgisTab"]').tab('show');
         }
 
@@ -429,7 +457,7 @@ $(document).ready(function () {
         table.clear().draw();
         if (data[1] != "設計圖" && data[1] != "成果圖") {
 
-            
+
             for (i = 0; i < response.length; i++) {
                 table.row.add([
                     response[i]["SN"],
@@ -450,7 +478,7 @@ $(document).ready(function () {
                 is_blueprint2 = true;
                 displayDetail(true, true);
             } else {
-                displayDetail(true, false);                
+                displayDetail(true, false);
             }
 
         } else {
@@ -461,13 +489,17 @@ $(document).ready(function () {
             countFiles(project_id, "true");
             for (i = 0; i < response.length; i++) {
                 notes[i] = response[i]['notes'];
-
+                if(fileNums[i] == null){
+                    total = 0;
+                }else{
+                    total = fileNums[i].total;
+                }
                 let temp = [
                     i + 1,
                     response[i]['notes'],
                     '',
                     '',
-                    fileNums[i].total,
+                    total,
                     data[5],
 
 

script/php/getDetail.php

@@ -31,7 +31,7 @@ if (isset($_GET['project_id'])) {
     
     $fetchResult = sqlsrv_query($conn, $sql);
     while ($row = sqlsrv_fetch_array($fetchResult)) {
-        array_push($array ,$row);
+        array_push($array ,str_replace("\\","/",$row));
     }
     echo json_encode($array,JSON_UNESCAPED_UNICODE);
 }

script/php/importTool/insertExcel.php

@@ -27,7 +27,7 @@ if (isset($_POST['file'])) {
     $project_name = $_POST['projectName'];
     $category_id = $_POST['categoryId'];
 } else {
-    header("Location: ./upload.html#error");
+    header("Location: ../../../upload.html#error");
 }
 
 $filename = "uploads/{$file}";
@@ -59,39 +59,44 @@ $sql =  "IF NOT EXISTS (SELECT [project_id] FROM [Project_Table] WHERE [project_
                 (?,?,?)
             END";
 $stmt = sqlsrv_query($conn, $sql, array($project_id,$project_name,$category_id));
+
+$sql = "SELECT [category_list] FROM [Category_List] WHERE [list_id] = (SELECT [list_id] FROM [Construction_Category] WHERE [category_id] = '{$category_id}');";
+$fetchResult = sqlsrv_query($conn, $sql);
+while ($row = sqlsrv_fetch_array($fetchResult)) {
+    $category_list = explode(",", $row[0]);
+}
+
 for ($s = 0; $s < $sheetCount; $s++) {
     if ($type[$s] != 'cancel') {
 
-        if (str_contains($all[$s], "_")) {
-            $Category = explode("_", $all[$s])[1];
-        } else if (str_contains($all[$s], ".")) {
-            $Category = explode(".", $all[$s])[1];
-        } else if (str_contains($all[$s], "-")) {
-            $Category = explode("-", $all[$s])[1];
-        } else {
-            $Category =  $all[$s];
-        }
-        $sql =  "DECLARE @filetype_id INT;
-                IF NOT EXISTS (SELECT [type_id] FROM [File_Category] WHERE [type_name] = '{$Category}')
-                BEGIN
-                    SET @filetype_id = (SELECT [filetype_id] FROM [21000X].[dbo].[File_Type_Table] WHERE [filetype_name] = '{$type[$s]}')
-                    INSERT INTO [File_Category] ([type_name],[filetype_id]) VALUES ('{$Category}',@filetype_id);
-                END";
-        $fetchResult = sqlsrv_query($conn, $sql);
-
-        $sql = "SELECT [type_id] FROM [File_Category] WHERE [type_name] = '{$Category}';";
-
-        $fetchResult = sqlsrv_query($conn, $sql);
-        $type_id = 0;
-        while ($row = sqlsrv_fetch_array($fetchResult)) {
-            $type_id = $row[0];
-        }
-        array_push($Category_List, $type_id);
+        // if (str_contains($all[$s], "_")) {
+        //     $Category = explode("_", $all[$s])[1];
+        // } else if (str_contains($all[$s], ".")) {
+        //     $Category = explode(".", $all[$s])[1];
+        // } else if (str_contains($all[$s], "-")) {
+        //     $Category = explode("-", $all[$s])[1];
+        // } else {
+        //     $Category =  $all[$s];
+        // }
+        // $sql =  "DECLARE @filetype_id INT;
+        //         IF NOT EXISTS (SELECT [type_id] FROM [File_Category] WHERE [type_name] = '{$Category}')
+        //         BEGIN
+        //             SET @filetype_id = (SELECT [filetype_id] FROM [21000X].[dbo].[File_Type_Table] WHERE [filetype_name] = '{$type[$s]}')
+        //             INSERT INTO [File_Category] ([type_name],[filetype_id]) VALUES ('{$Category}',@filetype_id);
+        //         END";
+        // $fetchResult = sqlsrv_query($conn, $sql);
+
+        // $sql = "SELECT [type_id] FROM [File_Category] WHERE [type_name] = '{$Category}';";
+
+        
+        $type_id = $category_list[$s-1];
+       
+        // array_push($Category_List, $type_id);
 
         $sheet = $spreadsheet->getSheet($s);
         $cellCollection = $sheet->getCellCollection();
         $column = $cellCollection->getHighestRowAndColumn();
-        $data = array();
+        
 
         for ($i = 2; $i <= $column['row']; $i++) { //行
             $row = array($project_id, $type_id);
@@ -125,19 +130,19 @@ for ($s = 0; $s < $sheetCount; $s++) {
                 array_push($row, '');
             }
             $stmt = sqlsrv_query($conn, $sql, $row);
-            echo "<br>";
+            // echo "<br>";
         }
-        echo "<br>";
-        echo "<br>";
+        // echo "<br>";
+        // echo "<br>";
     }
 }
 
-$Category_List_s = implode(",", $Category_List);
-$sql = "IF NOT EXISTS (SELECT [list_id] FROM [Category_List] WHERE [category_list] = '{$Category_List_s}')
-            BEGIN
-                INSERT INTO [Category_List] ([category_list])
-                VALUES ('{$Category_List_s}')
-            END";
-$fetchResult = sqlsrv_query($conn, $sql);
+// $Category_List_s = implode(",", $Category_List);
+// $sql = "IF NOT EXISTS (SELECT [list_id] FROM [Category_List] WHERE [category_list] = '{$Category_List_s}')
+//             BEGIN
+//                 INSERT INTO [Category_List] ([category_list])
+//                 VALUES ('{$Category_List_s}')
+//             END";
+// $fetchResult = sqlsrv_query($conn, $sql);
 sqlsrv_close($conn);
 header("Location: ../../../upload.html?status=success");