瀏覽代碼

教育訓練bug、程式庫filter bug

nate 3 年之前
父節點
當前提交
c8d67337a3
共有 4 個文件被更改,包括 28 次插入20 次删除
  1. 18 2
      api-list.php
  2. 5 4
      script/js/video-play.js
  3. 0 14
      script/php/display.php
  4. 5 0
      video-play.php

+ 18 - 2
api-list.php

@@ -97,7 +97,11 @@ if (!isset($_SESSION['loggedin'])) {
 					table[i].APIID = '';
 				listObj["APIID"] = table[i].APIID;
 				listObj["id"] = table[i].id;
+				if(table[i].object != null)
+					table[i].object = table[i].object.replaceAll(",", " ");
 				listObj["object"] = table[i].object;
+				if(table[i].usage != null)
+					table[i].usage = table[i].usage.replaceAll(",", " ");
 				listObj["usage"] = table[i].usage;
 				listObj["software"] = table[i].software;
 				listObj["detail"] = table[i].detail;
@@ -105,14 +109,26 @@ if (!isset($_SESSION['loggedin'])) {
 				listObj["source"] = table[i].source;
 				list.push(listObj);
 			}
+
 			var filter = data.objectFilter;
+			var filterArray = [];
+			
 			for (i = 0; i < filter.length; i++) {
-				objectFilter.push(filter[i].object);
+				filterArray = filter[i].object.split(",")
+				for(j = 0; j < filterArray.length; j++){
+					objectFilter.push(filterArray[j]);
+				}
 			}
+			objectFilter = [...new Set(objectFilter)];
+
 			filter = data.usageFilter;
 			for (i = 0; i < filter.length; i++) {
-				usageFilter.push(filter[i].usage);
+				filterArray = filter[i].usage.split(",");
+				for(j = 0; j < filterArray.length; j++){
+					usageFilter.push(filterArray[j]);
+				}			
 			}
+			usageFilter = [...new Set(usageFilter)];
 
 			vm.mount('.body');
 		}).error(function(error) {

+ 5 - 4
script/js/video-play.js

@@ -59,9 +59,9 @@ function getVideoList(dir) {
         for (j = 0; j < videos.length; j++) {
             if (videos[j].file_path.includes(".m3u8")) {
                 if (videos[j].id == id)
-                    $("#video-list").append("<li><a class='list-a' style='color:#0088CC;background-color:#B3E5FF' href = '#' onclick='getVideo(" + videos[j].id + ")'><i class = 'fa fa-video-camera'></i><span>" + videos[j].title + '</span></a></li>');
+                    $("#video-list").append("<li><a class='list-a' style='color:#0088CC;background-color:#B3E5FF' href = '#' onclick='getVideo(" + videos[j].id + ", \"" + folder + "\")'><i class = 'fa fa-video-camera'></i><span>" + videos[j].title + '</span></a></li>');
                 else
-                    $("#video-list").append("<li><a class='list-a' style='color:#0088CC;' href = '#' onclick='getVideo(" + videos[j].id + ")'><i class = 'fa fa-video-camera'></i><span>" + videos[j].title + '</span></a></li>');
+                    $("#video-list").append("<li><a class='list-a' style='color:#0088CC;' href = '#' onclick='getVideo(" + videos[j].id + ", \"" + folder + "\")'><i class = 'fa fa-video-camera'></i><span>" + videos[j].title + '</span></a></li>');
             }
         }
         for (j = 0; j < files.length; j++) {
@@ -108,9 +108,10 @@ function getFile(id) {
     window.location.href = "./script/php/video/getFile.php?id=" + id;
 }
 
-function getVideo(id) {
+function getVideo(id, folder) {
     $.redirect('./video-play.php', {
-        'id': id
+        'id': id,
+        'folder': folder,
     });
 }
 

+ 0 - 14
script/php/display.php

@@ -1,14 +0,0 @@
-<?php
-    include "connectSQL.php";
-
-    $sql = "SELECT * FROM components";
-    $fetchResult = sqlsrv_query($conn, $sql);
-
-    
-    while ($row = sqlsrv_fetch_array($fetchResult)) {
-        $row["FBX檔名"] = str_replace(".fbx", "", $row["FBX檔名"]);
-        $row["MD5FBX檔名"] = str_replace(".fbx", "", $row["MD5FBX檔名"]);
-        
-		echo '<li> <a href="./index.php?pic=' . $row["MD5FBX檔名"] . '">'. $row["FBX檔名"].'</a> </li>';
-	}    
-?>

+ 5 - 0
video-play.php

@@ -2,11 +2,16 @@
 
 
 session_start();
+
 if (isset($_POST["id"])) {
     $id = $_POST["id"];
+}
+$folder = "";
+if (isset($_POST["folder"])) {
     $folder = $_POST["folder"];
 }
 
+
 ?>
 <!doctype html>
 <html class="fixed">