更改匯入reset功能、新增is_awarded欄位

app/Http/Controllers/ActivityController.php

@@ -156,11 +156,12 @@ class ActivityController extends Controller
         $spreadsheet = $reader->load($inputFileName);
         $worksheet = $spreadsheet->getActiveSheet();
         $highestRow = $worksheet->getHighestDataRow();
-
+        date_default_timezone_set('Asia/Taipei');
         if ($option == 'prize') {
             if ($worksheet->getCell([1, 1])->getValue() == '獎品') {
-                DB::table('prizes')->where('activity_id', '=', $activity_id)->delete();
-                date_default_timezone_set('Asia/Taipei');
+                if(DB::table('prizes')->where('activity_id', '=', $activity_id)->exists()){
+                    DB::table('prizes')->where('activity_id', '=', $activity_id)->delete();
+                }
                 for ($row = 2; $row <= $highestRow; $row++) {
                     DB::table('prizes')->insert([
                         'activity_id' => $activity_id,
@@ -177,8 +178,9 @@ class ActivityController extends Controller
             }
         } else if ($option == 'guest') {
             if ($worksheet->getCell([1, 1])->getValue() == '來賓編號') {
-                DB::table('check_ins')->where('activity_id', '=', $activity_id)->where('region', '=', '來賓')->delete();
-                date_default_timezone_set('Asia/Taipei');
+                if(DB::table('check_ins')->where('activity_id', '=', $activity_id)->where('region', '=', '來賓')->exists()){
+                    DB::table('check_ins')->where('activity_id', '=', $activity_id)->where('region', '=', '來賓')->delete();
+                }
                 for ($row = 2; $row <= $highestRow; $row++) {
                     DB::table('check_ins')->insert([
                         'user_id' => $worksheet->getCell([1, $row])->getValue(),
@@ -186,6 +188,7 @@ class ActivityController extends Controller
                         'department_id' => 'guest',
                         'region' => '來賓',
                         'is_checked_in' => false,
+                        'is_awarded' => false,
                         'activity_id' => $activity_id,
                         'created_at' => now(),
                         'updated_at' => now(),

resources/js/src/views/lottery/Activities/ActivityStore.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-        <form-wizard color="#7367F0" :title="null" :subtitle="null" layout="vertical" finish-button-text="Submit"
-            back-button-text="Previous" class="wizard-vertical mb-3" @on-complete="formSubmitted">
+        <form-wizard color="#7367F0" :title="null" :subtitle="null" layout="vertical" finish-button-text="完成" next-button-text="下一頁"
+            back-button-text="上一頁" class="wizard-vertical mb-3" @on-complete="formSubmitted">
 
             <tab-content title="新增活動">
 
@@ -165,16 +165,17 @@ export default {
                 this.isSuccess = response.data.isSuccess;
                 if (this.isSuccess == true) {
                     this.$refs['insert-success-modal'].toggle();
-                    this.$refs[refOption].reset();
                 } else if (this.isSuccess == false) {
                     console.log('issuccess false')
                     this.errorText = '匯入Excel檔案錯誤';
                     this.$refs['insert-fail-modal'].toggle();
                 }
+                this.$refs[refOption].reset();
             }).catch(error => {
                 console.log('error: ' + error);
                 this.errorText = error;
                 this.$refs['insert-fail-modal'].toggle();
+                this.$refs[refOption].reset();
             });
         },
         formSubmitted() {

resources/js/src/views/lottery/Activities/ActivityUpdate.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-        <form-wizard color="#7367F0" :title="null" :subtitle="null" layout="vertical" finish-button-text="Submit"
-            back-button-text="Previous" class="wizard-vertical mb-3" @on-complete="formSubmitted">
+        <form-wizard color="#7367F0" :title="null" :subtitle="null" layout="vertical" finish-button-text="完成" next-button-text="下一頁"
+            back-button-text="前一頁" class="wizard-vertical mb-3" @on-complete="formSubmitted">
 
             <tab-content title="新增活動">
 
@@ -188,7 +188,7 @@ export default {
             this.$toast({
                 component: ToastificationContent,
                 props: {
-                    title: 'Form Submitted',
+                    title: '資料上傳完成',
                     icon: 'EditIcon',
                     variant: 'success',
                 },