Spaces:
Sleeping
Sleeping
ichieh commited on
Commit ·
0012170
1
Parent(s): b0a15a4
Improve error messages and registration flow
Browse files- sync_settings.gs +23 -22
- templates/index.html +10 -5
sync_settings.gs
CHANGED
|
@@ -47,21 +47,13 @@ function doPost(e) {
|
|
| 47 |
})).setMimeType(ContentService.MimeType.JSON);
|
| 48 |
}
|
| 49 |
|
| 50 |
-
else if (action === 'loadSettings') {
|
| 51 |
-
// 讀取桌次設定
|
| 52 |
-
var settingsSheet = sheet.getSheetByName('Settings');
|
| 53 |
-
var settings = settingsSheet.getRange('A2:B2').getValues()[0];
|
| 54 |
-
return ContentService.createTextOutput(JSON.stringify({
|
| 55 |
-
totalTables: settings[0],
|
| 56 |
-
seatsPerTable: settings[1]
|
| 57 |
-
})).setMimeType(ContentService.MimeType.JSON);
|
| 58 |
-
}
|
| 59 |
-
|
| 60 |
else if (action === 'backupParticipants') {
|
| 61 |
// 備份參與者資料
|
| 62 |
var participantsSheet = sheet.getSheetByName('Participants') || sheet.insertSheet('Participants');
|
| 63 |
participantsSheet.clear();
|
| 64 |
-
participantsSheet.getRange('A1:
|
|
|
|
|
|
|
| 65 |
|
| 66 |
var participants = data.participants;
|
| 67 |
if (participants && participants.length > 0) {
|
|
@@ -70,14 +62,15 @@ function doPost(e) {
|
|
| 70 |
p.id,
|
| 71 |
p.nickname,
|
| 72 |
p.email,
|
| 73 |
-
p.fb_link,
|
| 74 |
-
p.introduction,
|
| 75 |
p.table_id,
|
| 76 |
p.seat_number,
|
|
|
|
| 77 |
p.created_at
|
| 78 |
];
|
| 79 |
});
|
| 80 |
-
participantsSheet.getRange(2, 1, values.length,
|
| 81 |
}
|
| 82 |
|
| 83 |
return ContentService.createTextOutput(JSON.stringify({success: true}))
|
|
@@ -87,21 +80,29 @@ function doPost(e) {
|
|
| 87 |
else if (action === 'restoreParticipants') {
|
| 88 |
// 讀取備份的參與者資料
|
| 89 |
var participantsSheet = sheet.getSheetByName('Participants');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 90 |
var range = participantsSheet.getDataRange();
|
| 91 |
var values = range.getValues();
|
| 92 |
var participants = [];
|
| 93 |
|
|
|
|
| 94 |
for (var i = 1; i < values.length; i++) {
|
| 95 |
var row = values[i];
|
| 96 |
participants.push({
|
| 97 |
id: row[0],
|
| 98 |
nickname: row[1],
|
| 99 |
email: row[2],
|
| 100 |
-
fb_link: row[3],
|
| 101 |
-
introduction: row[4],
|
| 102 |
table_id: row[5],
|
| 103 |
seat_number: row[6],
|
| 104 |
-
|
|
|
|
| 105 |
});
|
| 106 |
}
|
| 107 |
|
|
@@ -123,8 +124,8 @@ function doGet() {
|
|
| 123 |
if (settingsSheet) {
|
| 124 |
var settingsData = settingsSheet.getDataRange().getValues();
|
| 125 |
if (settingsData.length > 1) { // 確保有數據
|
| 126 |
-
var totalTables = settingsData[1][0]; // 總桌數
|
| 127 |
-
var seatsPerTable = settingsData[1][1]; // 每桌人數
|
| 128 |
|
| 129 |
// 創建所有桌次
|
| 130 |
for (var i = 1; i <= totalTables; i++) {
|
|
@@ -149,11 +150,11 @@ function doGet() {
|
|
| 149 |
id: row[0],
|
| 150 |
nickname: row[1],
|
| 151 |
email: row[2],
|
| 152 |
-
fb_link: row[3],
|
| 153 |
-
introduction: row[4],
|
| 154 |
table_id: row[5],
|
| 155 |
seat_number: row[6],
|
| 156 |
-
is_table_leader: row[7],
|
| 157 |
created_at: row[8]
|
| 158 |
});
|
| 159 |
}
|
|
|
|
| 47 |
})).setMimeType(ContentService.MimeType.JSON);
|
| 48 |
}
|
| 49 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 50 |
else if (action === 'backupParticipants') {
|
| 51 |
// 備份參與者資料
|
| 52 |
var participantsSheet = sheet.getSheetByName('Participants') || sheet.insertSheet('Participants');
|
| 53 |
participantsSheet.clear();
|
| 54 |
+
participantsSheet.getRange('A1:I1').setValues([[
|
| 55 |
+
'ID', '暱稱', 'Email', 'FB連結', '自我介紹', '桌次', '座位號', '是否為桌長', '報名時間'
|
| 56 |
+
]]);
|
| 57 |
|
| 58 |
var participants = data.participants;
|
| 59 |
if (participants && participants.length > 0) {
|
|
|
|
| 62 |
p.id,
|
| 63 |
p.nickname,
|
| 64 |
p.email,
|
| 65 |
+
p.fb_link || '',
|
| 66 |
+
p.introduction || '',
|
| 67 |
p.table_id,
|
| 68 |
p.seat_number,
|
| 69 |
+
p.is_table_leader || false,
|
| 70 |
p.created_at
|
| 71 |
];
|
| 72 |
});
|
| 73 |
+
participantsSheet.getRange(2, 1, values.length, 9).setValues(values);
|
| 74 |
}
|
| 75 |
|
| 76 |
return ContentService.createTextOutput(JSON.stringify({success: true}))
|
|
|
|
| 80 |
else if (action === 'restoreParticipants') {
|
| 81 |
// 讀取備份的參與者資料
|
| 82 |
var participantsSheet = sheet.getSheetByName('Participants');
|
| 83 |
+
if (!participantsSheet) {
|
| 84 |
+
return ContentService.createTextOutput(JSON.stringify({
|
| 85 |
+
error: 'No participants data found'
|
| 86 |
+
})).setMimeType(ContentService.MimeType.JSON);
|
| 87 |
+
}
|
| 88 |
+
|
| 89 |
var range = participantsSheet.getDataRange();
|
| 90 |
var values = range.getValues();
|
| 91 |
var participants = [];
|
| 92 |
|
| 93 |
+
// 跳過標題列
|
| 94 |
for (var i = 1; i < values.length; i++) {
|
| 95 |
var row = values[i];
|
| 96 |
participants.push({
|
| 97 |
id: row[0],
|
| 98 |
nickname: row[1],
|
| 99 |
email: row[2],
|
| 100 |
+
fb_link: row[3] || '',
|
| 101 |
+
introduction: row[4] || '',
|
| 102 |
table_id: row[5],
|
| 103 |
seat_number: row[6],
|
| 104 |
+
is_table_leader: row[7] || false,
|
| 105 |
+
created_at: row[8]
|
| 106 |
});
|
| 107 |
}
|
| 108 |
|
|
|
|
| 124 |
if (settingsSheet) {
|
| 125 |
var settingsData = settingsSheet.getDataRange().getValues();
|
| 126 |
if (settingsData.length > 1) { // 確保有數據
|
| 127 |
+
var totalTables = parseInt(settingsData[1][0]); // 總桌數
|
| 128 |
+
var seatsPerTable = parseInt(settingsData[1][1]); // 每桌人數
|
| 129 |
|
| 130 |
// 創建所有桌次
|
| 131 |
for (var i = 1; i <= totalTables; i++) {
|
|
|
|
| 150 |
id: row[0],
|
| 151 |
nickname: row[1],
|
| 152 |
email: row[2],
|
| 153 |
+
fb_link: row[3] || '',
|
| 154 |
+
introduction: row[4] || '',
|
| 155 |
table_id: row[5],
|
| 156 |
seat_number: row[6],
|
| 157 |
+
is_table_leader: row[7] || false,
|
| 158 |
created_at: row[8]
|
| 159 |
});
|
| 160 |
}
|
templates/index.html
CHANGED
|
@@ -232,7 +232,8 @@
|
|
| 232 |
if (!selectedTableId) {
|
| 233 |
Swal.fire({
|
| 234 |
icon: 'error',
|
| 235 |
-
title: '
|
|
|
|
| 236 |
confirmButtonText: '確定'
|
| 237 |
});
|
| 238 |
return;
|
|
@@ -246,8 +247,8 @@
|
|
| 246 |
if (!nickname || !email) {
|
| 247 |
Swal.fire({
|
| 248 |
icon: 'error',
|
| 249 |
-
title: '
|
| 250 |
-
text: '暱稱和Email
|
| 251 |
confirmButtonText: '確定'
|
| 252 |
});
|
| 253 |
return;
|
|
@@ -273,7 +274,7 @@
|
|
| 273 |
if (result.success) {
|
| 274 |
await Swal.fire({
|
| 275 |
icon: 'success',
|
| 276 |
-
title: '報名成功
|
| 277 |
text: '您已成功報名座位',
|
| 278 |
confirmButtonText: '確定'
|
| 279 |
});
|
|
@@ -297,9 +298,11 @@
|
|
| 297 |
Swal.fire({
|
| 298 |
icon: 'error',
|
| 299 |
title: '報名失敗',
|
| 300 |
-
text: result.message || '
|
| 301 |
confirmButtonText: '確定'
|
| 302 |
});
|
|
|
|
|
|
|
| 303 |
}
|
| 304 |
} catch (error) {
|
| 305 |
console.error('Error:', error);
|
|
@@ -309,6 +312,8 @@
|
|
| 309 |
text: '系統發生錯誤,請稍後再試',
|
| 310 |
confirmButtonText: '確定'
|
| 311 |
});
|
|
|
|
|
|
|
| 312 |
}
|
| 313 |
}
|
| 314 |
</script>
|
|
|
|
| 232 |
if (!selectedTableId) {
|
| 233 |
Swal.fire({
|
| 234 |
icon: 'error',
|
| 235 |
+
title: '無法報名',
|
| 236 |
+
text: '請先選擇座位',
|
| 237 |
confirmButtonText: '確定'
|
| 238 |
});
|
| 239 |
return;
|
|
|
|
| 247 |
if (!nickname || !email) {
|
| 248 |
Swal.fire({
|
| 249 |
icon: 'error',
|
| 250 |
+
title: '無法報名',
|
| 251 |
+
text: '請填寫必要欄位(暱稱和Email)',
|
| 252 |
confirmButtonText: '確定'
|
| 253 |
});
|
| 254 |
return;
|
|
|
|
| 274 |
if (result.success) {
|
| 275 |
await Swal.fire({
|
| 276 |
icon: 'success',
|
| 277 |
+
title: '報名成功',
|
| 278 |
text: '您已成功報名座位',
|
| 279 |
confirmButtonText: '確定'
|
| 280 |
});
|
|
|
|
| 298 |
Swal.fire({
|
| 299 |
icon: 'error',
|
| 300 |
title: '報名失敗',
|
| 301 |
+
text: result.message || '該座位可能已被其他人選走,請重新選擇',
|
| 302 |
confirmButtonText: '確定'
|
| 303 |
});
|
| 304 |
+
// 重新載入桌次資料以顯示最新狀態
|
| 305 |
+
await loadTables();
|
| 306 |
}
|
| 307 |
} catch (error) {
|
| 308 |
console.error('Error:', error);
|
|
|
|
| 312 |
text: '系統發生錯誤,請稍後再試',
|
| 313 |
confirmButtonText: '確定'
|
| 314 |
});
|
| 315 |
+
// 重新載入桌次資料以顯示最新狀態
|
| 316 |
+
await loadTables();
|
| 317 |
}
|
| 318 |
}
|
| 319 |
</script>
|