From 378c5a62f75be4bf147a400258917bf979823770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E7=A5=A5=20=E8=A9=B9?= Date: Mon, 24 Mar 2025 10:25:33 +0800 Subject: [PATCH] updates --- BackEnd/api/exportExcel.ashx.cs | 16 ++++++++-------- BackEnd/assets/javascript/custom/userList.js | 12 ++++++------ BackEnd/userList.aspx | 4 ++-- bin/abbott_2024_event.dll | Bin 78336 -> 77824 bytes .../assets/javascript/custom/userList.js | 12 ++++++------ bin/app.publish/bin/abbott_2024_event.dll | Bin 73216 -> 73216 bytes 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/BackEnd/api/exportExcel.ashx.cs b/BackEnd/api/exportExcel.ashx.cs index 537ece4..87fa53d 100644 --- a/BackEnd/api/exportExcel.ashx.cs +++ b/BackEnd/api/exportExcel.ashx.cs @@ -122,42 +122,42 @@ namespace abbott_2024_event.BackEnd.api { case 3: { - inpercent = "0%~3%"; + inpercent = "低於3%"; break; } case 15: { - inpercent = "3%~15%"; + inpercent = "3~14%"; break; } case 25: { - inpercent = "15%~25%"; + inpercent = "15~49%"; break; } case 50: { - inpercent = "25%~50%"; + inpercent = "15~49%"; break; } case 75: { - inpercent = "50%~75%"; + inpercent = "50%以上 "; break; } case 85: { - inpercent = "75%~85%"; + inpercent = "50%以上 "; break; } case 97: { - inpercent = "85%~97%"; + inpercent = "50%以上 "; break; } case 100: { - inpercent = "97%~100%"; + inpercent = "50%以上 "; break; } diff --git a/BackEnd/assets/javascript/custom/userList.js b/BackEnd/assets/javascript/custom/userList.js index f794e54..b9da06c 100644 --- a/BackEnd/assets/javascript/custom/userList.js +++ b/BackEnd/assets/javascript/custom/userList.js @@ -324,12 +324,12 @@ function loadDataTable() { } htmlString += ""; - htmlString += " " + item.baby_name + "(" + gender + ")"; - htmlString += " 生日：" + item.baby_birthday + ""; - htmlString += " 測驗日期：" + item.baby_testdate + ""; - htmlString += " 年齡：" + item.baby_age + ""; - htmlString += " 身高：" + item.baby_height + " cm "; - htmlString += " 成長百分比：" + inpercent + ""; + htmlString += " " + item.baby_name + "(" + gender + ")"; + htmlString += " 生日：" + item.baby_birthday + ""; + htmlString += " 測驗日期：" + item.baby_testdate + ""; + htmlString += " 年齡：" + item.baby_age + ""; + htmlString += " 身高：" + item.baby_height + " cm "; + htmlString += " 成長百分比：" + inpercent + ""; htmlString += ""; }); diff --git a/BackEnd/userList.aspx b/BackEnd/userList.aspx index 93fbe1f..59d1fe4 100644 --- a/BackEnd/userList.aspx +++ b/BackEnd/userList.aspx @@ -104,7 +104,7 @@ Line UID 電話 測驗日期 - 寶寶資料 + 寶寶資料   @@ -200,5 +200,5 @@ - + diff --git a/bin/abbott_2024_event.dll b/bin/abbott_2024_event.dll index bbbad90e30771940af29fdaf44cd137f774bf1b1..b321017663970d16ae2e2d814dff2a99a061d767 100644 GIT binary patch delta 765 zcmZuvT}YEr7=GWgpQf2?ZKXqV-?oc=xsf9wi6WzhQ_#$&g@$eyp|#3yehCH|leDnt z!f_;ne$Wzx^1}Gg5n(@f-DE;Rff0*F7lGMbQ53yrv)$N%kLNkh`#kS=&fy(Q>jzW% z(Gi#B^KuugtrWPVjpzrE5x|%g7lVoWM{$57dJKUYgi`KgKHiF+{5KwQN#v6GRrF#x zpGObw;2+RspAAxpRxN!D3@|kYF!2xo$D6iem3EljY_4rCftc0qtpT+o%l3jA&9a?2 zCWCrDtCi)LEywZ&(<+aBMfSXmyIX&|-)S!&)-!vwX@ki!IcO`UEFwr{~@W;X3NPCk8nqv7uGm$t%> ze=a9$i*dm0`!|t{{G~KU5t_OPP2`bKAY_^TH1n=$q~T)yK(G1iFz?g(5ed1n?68qej+-$DW=eTZ|B|;YAGrCljf}nuyob;6s&wDnGkV z0z_i-#7lx~jkq0B7)!Xq_)suFd>p_z3qU46_(-YJK&Q@z7Ym`w>Il?;ysSkPAg^dq z2;^^C|(Y>e(801$du^Q60 zrEU5p-pIx>o7=O$VDZ)}p2sMEW&O>bf}cqE?qM5iwk5lKg8w|)7v~2~vW4bR>J?ah zi%5$FMQ-WU8S4e~C)lGycExxlNisSx&&a%yV9TWr=5F;<5S3G{Hhqp+MB!HIMSDaR zZNEfAB74`qNh?J5x?_ZVQW~#Il;*gV!OkE-WOLDB4wYTcIDGH&aj94GbJj&O&KeDIIFbv^ixN^8^F^Tf$_%xX8ab<@x~L?h;fDVu0QP03c@~!K?&}V z!}k~z!$F?qX&8f0I@d6U8TUY*hA}8j*ENhmSvuD+2IZ(gy+uRbKd5!sC3UI^8~IGl z8}^B0Rn_U*2eWfU1E%7S>Ki+`X_o%p2#V)*;vBEy)UV>KpNUjQhNdT$Uk)vvoZ1}8 z%?~}ltoHaw2H7d3=N%nzn8(7HxSLAh$tU~CHB~4gcZiznC%<&Gu1vKQkso9%xZ@At C`qKdb diff --git a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js index f794e54..b9da06c 100644 --- a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js +++ b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js @@ -324,12 +324,12 @@ function loadDataTable() { } htmlString += ""; - htmlString += " " + item.baby_name + "(" + gender + ")"; - htmlString += " 生日：" + item.baby_birthday + ""; - htmlString += " 測驗日期：" + item.baby_testdate + ""; - htmlString += " 年齡：" + item.baby_age + ""; - htmlString += " 身高：" + item.baby_height + " cm "; - htmlString += " 成長百分比：" + inpercent + ""; + htmlString += " " + item.baby_name + "(" + gender + ")"; + htmlString += " 生日：" + item.baby_birthday + ""; + htmlString += " 測驗日期：" + item.baby_testdate + ""; + htmlString += " 年齡：" + item.baby_age + ""; + htmlString += " 身高：" + item.baby_height + " cm "; + htmlString += " 成長百分比：" + inpercent + ""; htmlString += ""; }); diff --git a/bin/app.publish/bin/abbott_2024_event.dll b/bin/app.publish/bin/abbott_2024_event.dll index a455e0886b325ebd9b77a48cc97cd1ea8c1287ed..9501c1d0cc1f7fb4b4915ff01ab2c26e71ef8274 100644 GIT binary patch delta 1501 zcmbVMZ){Ul6u;;7&tBJ+_4TcP-uk+Aj>R<>^07y|~y6=8G9QoNyo zNR*9?X+RR{olFCnQc*&dsPKSln2Ym^gJ?8r@PkfchVg^q_^=S8iFjVyt(XNr*rey4 z^ZWhox#!+<@9Q7e_mAsOyresI^Sk6R54@5*-vRXuV3~mr0+Cq-SH-r%GI)&*z#-Vj zfD;Y3&k+J6KiOfW+QJn#)JNT9ujufHXm8f>&pQv$16f3xcdYYHLCz6)p_mP{*wstn zhoN=|&-RaO&HD2g_bjv}DcVU+T@=_TgbD0?OliuWU=i-*zD zBAM)^AvA)OM%B$5AA*uWjN*rpta9q&k7=SonN4~{_C}SdWOxxdoF#8GJ}8{kNEK&H zrwxRda7jy(pZh>&tD8KoDI~F8n~@$77Rr)ng2kI0+r~UdDj(rgk;i!`RgP*Eln6Y% zfSieH3gxMcz|8{XSAu>IVdNQEic+8T5VRP4}I-SMD}Bo!mlgC4f1q= z6-Rb%KY~Gg9C^XwjDLtD9mylEEOI7~NLl1u9x2Tt7xIWZi(D;JuSfR7%KzD9^+3z# zAWdT0Yzrluly4y(X0+A)AN?z)QFgNR)rxPmvhL~dEiKlX!X12z5Ir@hjcuDa+hUn| zv3(7Q)#WJvSNE$Kba>X)Ey5R&cqwN08)z6Mq9J!@niuJtSyxA&umkbuzsEw1v|Dqh z*_mpGBpB&_jFchFwCWfkggbavEA|juvSp}pY=L?b2oVg*Hz*T}a+=G?maxx4ZuP4z zcRAzNTGpGG)uqmMehJ)cIh)+E);Q=z_>Q)iS{9Xc_r2vFu^_jD`(E{ASHLo?rTZhZ zjZrTP#3a*nK!>#%u}{Bu1ua+dJl_96teTsW+0K}KO(Jt$OKpXe=yAjIuk)S zya2mk&b$Bw$JqNZ7dPW!*JCn>?3b9re~inZV1PMyJ(s=ZX45SJ3wM1ksN6Xvn8Mk3v#4K64c?_@oyh_1E5KIq7r-A(icIWYcLv ztk{*xhW7A!9G_MbeRVIwBkaAo4eFh_<%R6Gzj?Lh?woG9DbhT?J4k#4%t7)3sU;!w ziKUjTz$ipkWug_N2FITxg%K}-^qV?x7_FTFr+n+(i%*=t_KxX`#Kg7qlnG9ltMFsn zjVlrk|1x%eDSm2~+JUsTt#50XnK-ri?X?@&_LfBWFaPoMpdEOy^@LED`yJMNZ?eJx f`_h*kuoXsb+o3VN#07uqxZzM*kYN^*H3k0wm!gL& delta 1576 zcmbVMZ){Ul6hHTM?fQq(zP`0<*LGW7D$jIm!_I7jsTdcR!HRQZjG=?AL^c*@=Z%Vp zmSP0WaE9hamL&$UU>q?j@`x3k!u+5Sa1vwoL0r{@=mH7EWHrVm&U5=}i&^l4O?v+P z&hMUk?mg$e*knO$vf$9mns<+VA3x|NsrZR5@(Lqlg?3|*fQR{nO4dzQkSlB-*-Oqb zB1qcC2>>z{x05=hO|Uet?RCSj3gbCNI%OMqF%JH zeQkE-bW1&1bqTSA-zgSEW&m^vzl+XfkP>+{fKifc5}iXpUV~o3@1}n-?|P3{?}6b+ z3?WUV1tr~tK8>Oft#m@!wEhlKG|ee5V6d`S6S+Ps;1Z92MN%$4P$XIUiV*plW!`BPjf>2V$Akw4g6EJ(31$yyDMN~+&CbmD68<>r>lzZ@M*R67un-;n zfSa@I&1#2B)X^#QVZkoft^Uajftsc!Sr`#(QW>0X-QIGdknNvL7 zADLs!m9wg_%P?D|!P<1#r|W$|Gx&0God2qDwP5qIZDD)k*~~L2u^A~8;DP^noi{xI z6Hk(R0d~=pc>xHf*~zd|SXs)>hdrc+{Ti0_M%)Go7g+K3XVob;(YKWG?RtS+W{F4V zQI73+0A*^&J19r`Wt2+)hbRXJf+&v+aOBH@d&p%)xAPN%&gX*&Dc1&{5L|OUfQrrz zIQlw(6}wW=+}YBE`lRyI(3+Rnsre>yx00R@8Vd*DNf?61l)_;j*cLnNII zU|sa++-RUa6x-EojD2yHC7&~pL#9gne)r=cK)}BT2Wl9<-othR?Hx@WXBJGyq4#3z z$5-D!@z5_LA0_MUL{H48Ymt}zO^<~f#7)j6cRENnNiKJiKQ+QnwMo%KZjg9Q;ork# Bm-GMt