+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/abbott_2024_event.csproj b/abbott_2024_event.csproj
index fc06f1c..4f78544 100644
--- a/abbott_2024_event.csproj
+++ b/abbott_2024_event.csproj
@@ -26456,6 +26456,8 @@
+
+
@@ -26474,6 +26476,9 @@
babyRecList.ashx
+
+ chgBabyData.ashx
+
chgPassword.ashx
@@ -26483,6 +26488,9 @@
clearLineUid.ashx
+
+ delBabyData.ashx
+
exportBabyRec.ashx
diff --git a/bin/abbott_2024_event.dll b/bin/abbott_2024_event.dll
index 7ea1d3b..eb52607 100644
Binary files a/bin/abbott_2024_event.dll and b/bin/abbott_2024_event.dll differ
diff --git a/bin/app.publish/BackEnd/api/chgBabyData.ashx b/bin/app.publish/BackEnd/api/chgBabyData.ashx
new file mode 100644
index 0000000..fda19e5
--- /dev/null
+++ b/bin/app.publish/BackEnd/api/chgBabyData.ashx
@@ -0,0 +1 @@
+<%@ WebHandler Language="C#" CodeBehind="chgBabyData.ashx.cs" Class="abbott_2024_event.BackEnd.api.chgBabyData" %>
diff --git a/bin/app.publish/BackEnd/api/delBabyData.ashx b/bin/app.publish/BackEnd/api/delBabyData.ashx
new file mode 100644
index 0000000..b9db1bd
--- /dev/null
+++ b/bin/app.publish/BackEnd/api/delBabyData.ashx
@@ -0,0 +1 @@
+<%@ WebHandler Language="C#" CodeBehind="delBabyData.ashx.cs" Class="abbott_2024_event.BackEnd.api.delBabyData" %>
diff --git a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
index f16f750..b1d53e6 100644
--- a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
+++ b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
@@ -5,6 +5,12 @@ var oPos;
$(document).ready(function () {
var actualDate = new Date(); // convert to actual date
var prevDate = new Date(actualDate.getFullYear(), actualDate.getMonth() - 6, actualDate.getDate());
+ var startDate = new Date("2025/4/1");
+
+ if (prevDate < startDate) {
+ prevDate = startDate;
+ }
+
var startTxt = prevDate.getFullYear().toString() + "/" + padding(prevDate.getMonth() + 1, 2) + "/01";
var endTxt = actualDate.getFullYear().toString() + "/" + padding(actualDate.getMonth() + 1, 2) + "/" + padding(actualDate.getDate(), 2);
@@ -41,6 +47,117 @@ $(document).ready(function () {
window.open(url);
});
+
+ $('#delBabyBtn').click(function () {
+ if (confirm('確定要刪除此筆寶寶的所有資料?')) {
+ if (confirm('再次確定要刪除此筆寶寶的所有資料? 刪除後將無法回復!')) {
+ var babyData_uid = $('#baby_select').val();
+
+ var formData = {
+ babyData_uid: babyData_uid
+ }
+
+ $.ajax({
+ url: "api/delBabyData.ashx",
+ type: "POST",
+ data: formData,
+ success: function (data, textStatus, jqXHR) {
+ if (data.ret == "yes") {
+
+
+ alert('刪除完成');
+ $('#baby_select option:selected').remove();
+
+ loadBabyRec();
+ } else {
+ alert(data.message);
+ $('#saveEditBabyBtn').attr('disabled', false);
+ }
+ },
+ error: function (jqXHR, textStatus, errorThrown) {
+ alert('網絡或伺服器发生错误,请稍后重试!');
+ $('#saveEditBabyBtn').attr('disabled', false);
+ }
+ });
+
+ }
+ }
+ });
+
+ $('#editBabyBtn').click(function () {
+
+ $('#edit_babyData_uid').val($('#baby_select').val());
+ $('#edit_babyData_name').val($('#baby_select option:selected').attr('baby_name'));
+ $('#edit_babyData_sexual').val($('#baby_select option:selected').attr('baby_sex'));
+ $('#edit_babyData_birthday').val($('#baby_select option:selected').attr('baby_birthday'));
+
+ $('#edit_baby_name').val($('#baby_select option:selected').attr('baby_name')).trigger('change');
+ $('#gender_baby_select').val($('#baby_select option:selected').attr('baby_sex'));
+
+ $('#editBabyModal').modal('toggle');
+
+ });
+
+ $('#saveEditBabyBtn').click(function () {
+ if (confirm('確定要儲存變更後資料?')) {
+ if (confirm('再次確定要儲存?時間依紀錄量而定,可能會長到數分鐘!')) {
+ $('#saveEditBabyBtn').attr('disabled', true);
+
+ var new_name = $('#edit_baby_name').val();
+ var new_gender = $('#gender_baby_select').val();
+ var birthday = $('#edit_babyData_birthday').val();
+
+ if (new_name == $('#edit_babyData_name').val() && new_gender == $('#edit_babyData_sexual').val()) {
+ alert('姓名與性別與原來的相符,不需要儲存!');
+
+ $('#saveEditBabyBtn').attr('disabled', false);
+ return;
+ }
+
+ var formData = {
+ babyData_uid: $('#edit_babyData_uid').val(),
+ babyData_name: new_name,
+ babyData_sexual: new_gender
+ }
+
+ $.ajax({
+ url: "api/chgBabyData.ashx",
+ type: "POST",
+ data: formData,
+ success: function (data, textStatus, jqXHR) {
+ if (data.ret == "yes") {
+
+ var gender_txt = "";
+
+ if (new_gender == "M") {
+ gender_txt = "男";
+ } else {
+ gender_txt = "女";
+ }
+
+ var babyTxt = new_name + " (" + gender_txt + "), 生日:" + birthday;
+ $('#baby_select option:selected').text(babyTxt).attr("baby_sex", new_gender).attr("baby_name", new_name).attr("baby_birthday", birthday);
+
+ //$("#baby_select").append($("
").attr("value", item.baby_uid).text(babyTxt).attr("baby_sex", item.baby_gender).attr("baby_name", item.baby_name).attr("baby_birthday", birthday));
+
+ $('#editBabyModal').modal('toggle');
+ alert('儲存成功!');
+ $('#saveEditBabyBtn').attr('disabled', false);
+ loadBabyRec();
+ } else {
+ alert(data.message);
+ $('#saveEditBabyBtn').attr('disabled', false);
+ }
+ },
+ error: function (jqXHR, textStatus, errorThrown) {
+ alert('網絡或伺服器发生错误,请稍后重试!');
+ $('#saveEditBabyBtn').attr('disabled', false);
+ }
+ });
+
+ }
+ }
+ });
//$.ajax({
// url: "api/userList.ashx",
// type: "POST",
@@ -140,7 +257,7 @@ function buttonClick(obj) {
var babyTxt = item.baby_name + " (" + gender + "), 生日:" + item.baby_birthday;
- $("#baby_select").append($("
").attr("value", item.baby_uid).text(babyTxt));
+ $("#baby_select").append($("
").attr("value", item.baby_uid).text(babyTxt).attr("baby_sex", item.baby_gender).attr("baby_name", item.baby_name).attr("baby_birthday", item.baby_birthday));
});
loadBabyRec();
diff --git a/bin/app.publish/BackEnd/userList.aspx b/bin/app.publish/BackEnd/userList.aspx
index 28b4832..1846a41 100644
--- a/bin/app.publish/BackEnd/userList.aspx
+++ b/bin/app.publish/BackEnd/userList.aspx
@@ -149,16 +149,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/bin/app.publish/bin/abbott_2024_event.dll b/bin/app.publish/bin/abbott_2024_event.dll
index 7ea1d3b..eb52607 100644
Binary files a/bin/app.publish/bin/abbott_2024_event.dll and b/bin/app.publish/bin/abbott_2024_event.dll differ