Merge branch 'master' of http://10.1.1.202:3030/steve07s/lottery

app/Http/Controllers/API/UserController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use App\Models\User;
+use App\Models\Department;
 
 class UserController extends Controller
 {
@@ -50,9 +51,11 @@ class UserController extends Controller
      */
     public function show(Request $request,User $user)
     {
-        $maaUser = User::where('user_id', '=', $request->id)->get()[0];
+        $user = User::where('user_id', '=', $request->id)->get()[0];
+        $department = Department::where('department_id','=',$user->department_id)->get()[0];
+        $use->department = $department;
         $response = [
-            'user' => $maaUser,
+            'user' => $user,
         ];
 
         return response($response, 201);

resources/js/src/navigation/vertical/index.js

@@ -23,15 +23,16 @@ export default [{
                 title: '活動列表',
                 route: 'activityList',
                 icon: 'ActivityIcon',
-            }]
-        },
-        {
-            header: '管理功能',
-        },
-        {
-            title: '權限管理',
-            route: 'permission',
-            icon: 'LockIcon',
-        }
+            }
+        ]
+    },
+    {
+        header: '管理功能',
+    },
+    {
+        title: '權限管理',
+        route: 'permission',
+        icon: 'LockIcon',
+    }
 
-    ]
+]

resources/js/src/views/lottery/CheckIn.vue

@@ -114,41 +114,6 @@ export default {
   },
   mounted() {
 
-    var onScanSuccess = (decodedText, decodedResult) => {
-      // handle the scanned code as you like, for example:
-      console.log(`Code matched = ${decodedText}`, decodedResult);
-      this.scannerText = decodedText;
-    }
-
-    function onScanFailure(error) {
-      // handle scan failure, usually better to ignore and keep scanning.
-      // for example:
-      console.warn(`Code scan error = ${error}`);
-    }
-
-    let html5QrcodeScanner = new Html5QrcodeScanner(
-      "reader",
-      { fps: 30, qrbox: { width: 500, height: 500 } },
-  /* verbose= */ false);
-    html5QrcodeScanner.render(onScanSuccess, onScanFailure);
-    // This method will trigger user permissions
-    Html5Qrcode.getCameras().then(devices => {
-      /**
-       * devices would be an array of objects of type:
-       * { id: "id", label: "label" }
-       */
-      if (devices && devices.length) {
-        var cameraId = devices[0].id;
-        // .. use this to start scanning.
-      }
-    }).catch(err => {
-      // handle err
-    });
-    // html5QrCode.stop().then((ignore) => {
-    //   // QR Code scanning is stopped.
-    // }).catch((err) => {
-    //   // Stop failed, handle it.
-    // });
   }
 }