diff --git a/App_Code/dbClass.cs b/App_Code/dbClass.cs index f3385af..f4f3612 100644 --- a/App_Code/dbClass.cs +++ b/App_Code/dbClass.cs @@ -66,11 +66,17 @@ public class babyRec public int babyRec_recDay { get; set; } = 0; public int babyRec_months { get; set; } = 0; + + public string babyRec_yearLastRec { get; set; } = "N"; public string babyRec_monthLastRec { get; set; } = "N"; + public string babyRec_dayLastRec { get; set; } = "N"; + public string babyRec_newestRec { get; set; } = "N"; public string babyRec_yearMonthStr { get; set; } = ""; public DateTime babyRec_createdate { get; set; } = DateTime.Now; - + public int temp_int { get; set; } = 0; + public double temp_float { get; set; } = 0; + public string temp_nvarchar { get; set; } = ""; public string utm_source { get; set; } = ""; public string utm_medium { get; set; } = ""; public string utm_campaign { get; set; } = ""; diff --git a/BackEnd/Login.aspx.cs b/BackEnd/Login.aspx.cs index ae8ea1d..8eaf45b 100644 --- a/BackEnd/Login.aspx.cs +++ b/BackEnd/Login.aspx.cs @@ -62,6 +62,10 @@ namespace abbott_2024_event.BackEnd isAllow = true; } + objAllow2.disConnection(); + objAllow3.disConnection(); + objAllow4.disConnection(); + conn.Close(); if (isAllow == false) { diff --git a/Web.config b/Web.config index 550c27a..ac9253a 100644 --- a/Web.config +++ b/Web.config @@ -80,10 +80,23 @@ - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/abbott_2024_event.dll b/bin/abbott_2024_event.dll index b321017..7ba3018 100644 Binary files a/bin/abbott_2024_event.dll and b/bin/abbott_2024_event.dll differ diff --git a/bin/abbott_2024_event.dll.config b/bin/abbott_2024_event.dll.config index 550c27a..ac9253a 100644 --- a/bin/abbott_2024_event.dll.config +++ b/bin/abbott_2024_event.dll.config @@ -80,10 +80,23 @@ - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/app.publish/Web.config b/bin/app.publish/Web.config index 07513ca..581df8e 100644 --- a/bin/app.publish/Web.config +++ b/bin/app.publish/Web.config @@ -80,10 +80,23 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/app.publish/bin/abbott_2024_event.dll b/bin/app.publish/bin/abbott_2024_event.dll index 9501c1d..7ba3018 100644 Binary files a/bin/app.publish/bin/abbott_2024_event.dll and b/bin/app.publish/bin/abbott_2024_event.dll differ diff --git a/webapi/babyData.ashx.cs b/webapi/babyData.ashx.cs index 45e2b09..5a0b492 100644 --- a/webapi/babyData.ashx.cs +++ b/webapi/babyData.ashx.cs @@ -192,6 +192,8 @@ namespace abbott_2024_event.webapi newRec.babyRec_height = double.Parse(height); newRec.babyRec_months = globalClass.MonthDiff(newBaby.babyData_birthday, newRec.babyRec_recdate); newRec.babyRec_monthLastRec = "Y"; + newRec.babyRec_yearLastRec = "Y"; + newRec.babyRec_dayLastRec = "Y"; newRec.babyRec_yearMonthStr = globalClass.YearMonthDiff(newBaby.babyData_birthday, newRec.babyRec_recdate); newRec.utm_source = utm_source; newRec.utm_medium = utm_medium; @@ -226,7 +228,9 @@ namespace abbott_2024_event.webapi newRec.babyRec_middleHeight = objMidHei.lenHeiTable_maxVal; if (newRec.babyData_uid != "") { - conn.Execute("update babyRec set babyRec_monthLastRec = 'N' where babyData_uid = @babyData_uid and babyRec_recYear = @babyRec_recYear and babyRec_recMonth = @babyRec_recMonth and babyRec_months = @babyRec_months", new { babyData_uid = babyData_uid, babyRec_recYear = newRec.babyRec_recYear, babyRec_recMonth = newRec.babyRec_recMonth, babyRec_months = newRec.babyRec_months }); + conn.Execute("update babyRec set babyRec_yearLastRec = 'N' where babyData_uid = @babyData_uid and babyRec_recYear = @babyRec_recYear ", new { babyData_uid = babyData_uid, babyRec_recYear = newRec.babyRec_recYear }); + conn.Execute("update babyRec set babyRec_monthLastRec = 'N' where babyData_uid = @babyData_uid and babyRec_recYear = @babyRec_recYear and babyRec_recMonth = @babyRec_recMonth", new { babyData_uid = babyData_uid, babyRec_recYear = newRec.babyRec_recYear, babyRec_recMonth = newRec.babyRec_recMonth }); + conn.Execute("update babyRec set babyRec_dayLastRec = 'N' where babyData_uid = @babyData_uid and babyRec_recYear = @babyRec_recYear and babyRec_recMonth = @babyRec_recMonth and babyRec_recDay = @babyRec_recDay ", new { babyData_uid = babyData_uid, babyRec_recYear = newRec.babyRec_recYear, babyRec_recMonth = newRec.babyRec_recMonth, babyRec_recDay = newRec.babyRec_recDay }); } conn.Insert(newRec);