From 339e00347ec67fca528ea702456e34f3181512f6 Mon Sep 17 00:00:00 2001 From: miteruzo Date: Fri, 15 Dec 2023 02:28:54 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A5=E3=81=A5=E3=81=91=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=88=E5=81=B4=E3=81=A0=E3=81=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broadcast/index.frm.php | 16 ++++++++++++++++ broadcast/script.js | 3 +++ 2 files changed, 19 insertions(+) diff --git a/broadcast/index.frm.php b/broadcast/index.frm.php index 38e2e6b..bc0ebe3 100644 --- a/broadcast/index.frm.php +++ b/broadcast/index.frm.php @@ -3,7 +3,11 @@ + + + + 伊地知ニジカ放送局 - ニジカ返答ログ @@ -43,6 +47,18 @@ +
+
+ 日時ニジカ +
+ +
+ + 〜 + +
+
+
フリーワード diff --git a/broadcast/script.js b/broadcast/script.js index a442aad..447cf8e 100644 --- a/broadcast/script.js +++ b/broadcast/script.js @@ -4,6 +4,9 @@ Script static main () { + $ ('#filter-date-start').datepicker (); + $ ('#filter-date-end').datepicker (); + const url = new URL (window.location.href); const orderAsc = document.getElementById ('order-asc'); From b23e04af75397cc783a2b8c32d75060414afe67f Mon Sep 17 00:00:00 2001 From: miteruzo Date: Sun, 17 Dec 2023 08:22:26 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A5=E3=81=A5=E3=81=91=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broadcast/favicon.ico | Bin 0 -> 22326 bytes broadcast/index.frm.php | 6 ++++-- broadcast/index.php | 15 +++++++++++++++ broadcast/script.js | 24 ++++++++++++++++++++++-- 4 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 broadcast/favicon.ico diff --git a/broadcast/favicon.ico b/broadcast/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..64f57c4a76a038a82b62f7e3d62a3a565ac083a1 GIT binary patch literal 22326 zcmeI3&ud%hn&%bgGV7Rx*$ud5-1IWG95c1M8T%Ssb30t@maJl+n_ITdNIlG^yImH< zfgY+P9oa=gcjsy>2kvHSnplRjYKUS9uWE<~%Zq`5EXIZ~)TU%G^ncKw@AIBta-^!J z*LjmjN76ap=Xt-+&-Xninan-@ynXwC*I#62HZz%jo5^JUh<|VS_ZRmv_C1GVNA?f? zIP(Yp?$0uRH2)tmtH1FwYo8xyKC3*>{ON!FZ<+t}cmE^vm%n?R`S!mbXL|qZedfFW zeUu6E|DXS#d4K&+hIf5+b#;Atb$L1H_3HIM?*zBwMsS;aZ%4!UEFC4E^mY8{ z0}?K;-53lm-um7*ulW6$PIBW}bfEY6y7ZUfF~0>I1|ug4-|2rnxEl0)zuY{%J<}D> z^pYMy{DGsN5)_}uK}!G2tE*nmU#%Po9*FT6!}x2R^0OnQ|K;G~qFb*we{brWfOZPtdQRmsYY5lS9!J${_Iey~HL(CL(ba8x2>L74)kG_fYmj_AzZ|Z)> z^p8#m65L^Q7^GY&I?w3~`sgrx=RTL0mp%BYyt?6(XQQXx-a4uRzSh6-Ba&~_1a^+Y z2m1QzdT`O}`X2ss3qwP2o{fUVm)n&SUxM^6hVKI43WB=za^>{qjse2+4L)(7G|J>- zr@z?0yu331DI5R6F9~W%TEYAh{|zim%62|7Dg4^%q5# zm+;^6n(!|Voj8KP0%1%L1Rq~x_?KpYOY)oi)AZM=v9_tphQr{t(;0U77l)gE4x)27 z&~?%0Q2%TE|BCqa>t*LZoH7pnHs~C;8AlSpIpfC2_lA#m%7GAI`rl0EXZWMRx7%xN z1OyTM2xRo7y+`^(Kjp>6m;EsIl4r-q?aJEL>Q<%FZg-AGklcsBz3FN@Oz@e2#V`Ee zKm2IFb6#o;kK5Zzx%-cEi@EK}+R;&v`fbc1Kd0~q_@{67oy1S4-QLbUetiG_{mlH< zQl*lv)IqGz$jlS`EBNodt$WS0-WXNvtK+t}yf}Yv{@(P%hYyz*D{E~uOhzgq;_nmu zYw1sX9d?vH(I!48MEK!{A6{_@41UdQvE$-P-=` z;`A@38NYb==<(v>;>$M5L?eg}!gu?e;43}%n$%zA|8dU$Y;Ae@;qvnG>gp=5zkK@3 z`J6`}glHpgLHsGf$9)F9*LANQ)yL!{cXr#`UR+7W;^Nc!4KAY;EP~%AdseYb#79w>n`0PNOuw@`Lej8jbjvI~mvfmC*m=%E~|TXJuu3W%1#| z^aPwrTxtjIQ%Zm1zg3q1*l;I=AAb1ZyKSMz0||@wA1*^@c*dQ#@ah;}3Bu}o+eOXY z860mfCgem?p3XCY5Xs@+y)403{_GvL%1)uX=Y97wGVZTee!cQNe^$O*Th1-#K1(K$ z667xDHO8mHh<~36bDn-55kcfiX+ft4{+i%(jfqHK7~@|WKX1K?<9~SD;q-XmJd0^u zj=x`7VNQ>iDwDFDiHY$oLHC-zw=dwk<+Z*2+il?k`p5S7|LW7q>hj{Em%{}QAoHh(P0dL`W_Hz3XaNqL}U?kXB1AjTUG(u2#K@eS;;FCTFW{8L*y zM@jY#j#n3rp6^3sz3CWyvRurhP-A2#A;Guh7x~kvqY56M+ChEkpNwz{GC;2KQ5}mf zO!K1x>GYQll<_2W{rGZm8th*u`0>$VE|)fdQ`%mgkd*%7=WX5P^kJvnN_hQzb^2+H z7#^6g?bX$J4B()IDxWdG(T9M42|g=S>SMjq6rG*p7P*%L8|}Y+ivHu&hyU4J%7LOQ zVlyQ87Qb)n%_G&M&avlJB7%Nw|8jbi{%{U!E8E+-`)U2b4`LZQNboKH`_y0bhaNBC zb@<)l$NV@EIM7t?4nLFd<^OM6rZx0zEi6UzZm-Tyz^9Tuyr0I8uwxs<`qP49U*kU* zg1?ZB1Lw!q)9E|@8C!cXcRyDNBG`}LV|00af5++2-h%(>Pyq0Zr(wQW{^eur6u9#&HR#wRxGz)sUk&=o zKll&)&zk;r&age7kpUj9EU!FzYVhvk$|^0y6#R_pkANfxrSM(;DHDy(zS)rfVLNw^ z35cPm5xh;{(aNL6$C;1#PxwK-1mF6rCRyhceB59BJN;YB=&uRjI-&aEe3q9V%w)4^ z{Q=iSb|LQxejLC1ra$+BsUu1vj9~KV$ zC-dL|7PvQUFVi}9<3R>~W}`e3>1@;wB`HYZhs$f_PxKf6VdpV?iT*%75WHR_$1HO1 zf%KoP{60dq_aJ^nLacwdzVJj!;P_AJj{srX(7PrAVJl=3Hrqk zsAC7;C-}5Kw9-4oe03&JI?9C()D>X*)5AGKV13rbX{D1Bj@XrAM z$3No&(8@`FFa;};@K&(zh5U@xFT<7uC*=bdLJh;VC&fScxvlukh8@aK_z!RzAv=;l zmoMR-Q&TaGLdG}r7NOq;F}~%WbMn9QPx3zjU=vq--Ftw(Vtv|JGEqhk{HOItY5oR@ zfEeHDPkUwhTYi{z4mu=%GJ$E(6Bo*uC=1`n4FDBzGQ?1VFaEpYpU6A*78Jm)a}qz| zU3}{uUStVA0FQm+J|;pIZeSmRG(PKh<)70yKg_z$VE8hJwjuM=8NutLxzE&;_~}H* zzzW>aZ%2v#1E>EX%L?kR^q+N}hd0T2#CgcRCZcaLX5UnQXyyesFd=$L@PWVZYuNWp z_%iPT_?$Ux%`3VLUTMLU&*+91;WZVfLBO2uf@K8un&4lu{U-l8Woc^t4-;@1x}BRr zUxlk?Apt;Z0@6Q?FVM6ML?rm=KRBot*i;)1k6Vf_GLTx!;Y;|z{gu>A0=Nj^ZwBw= zBv&R(-S8#iDdqoc53_w()AkkqL;vO+NchrU8k+>82MPL&{?-P>(7GuR<~9yAK5(Lo zU)5jyr-^;Rmwgvzt%Xp1(F7O}JE|5~>f3T60F0mx-#VoGG7YL=PdJnp`V^Jv`5EPhsLAM5;h zjO?lF+Yg-W@X7xJzqV!D=V5`*$^cm7?;jf`QI#mqH@S-T(PL~KNcC_8_MYII{}-Ov z`c4iM8K5)#v6Y*ekpv0QyBqiJvxy#|rQbm|IePiPxgkH&|La2K6($1T3@}R#KEfKm zbrUcnhv=D%i;gs~J9hAHCP9KveZT0IHY)o;03~p46JQIqgEbyc;X;hiw(i5~$AM*@ zlNOoa%YUk0hc!#X)_^2X3>g3ki)qMP6N_w=8-3)0HT ze-_9=?IT%(T#&%q;r*~b5|oXAEuDZPQ4<(HY5%AH?^m~SUzk!dfFhV2%>>$XxFJEv z2<6O7jpEylnGt7|&<|V?+7|~!f3F>I|AGw&B7gwPE?|K+A7*AU{EY|VEI5Q=gDcwj zYv4Y(?|A*d6%L=Lebrbc{t0|bTP_YihEL(^ z_JyC{SmOQ~EQSPuzkmfaf$U6H9BCdxr?em$Te$)JRxY=+_5)TG_kn$#=3n{0x;{5& z`m_D!dR$C^3o!v!64IT95NL!=j|6F2YBBh0EQgb{b#)-^gdzzo3DJA$cfQWC=4SP-%G-0jM$EXGD?&N4Y;b znNklo?yr{Txx;MDmK z^>I+mXXgs4VCc|kyA%h0ZpmwV9(TTGz_4NPqN5`a8P~E2^;)_mBS`S6kG%%^|C`FG z0)04il;S_L5aG382mv;q@I|2=fTgJt?Ko_5GeF>T@U_A~lBe9+0GbRw0O?p?ca6qa5Rk8MVYp2~M4y6Z!NZ}GdaaX+^jWhp{9 zBuH;s< zVSz=)sm{_qdJ1wfxU5UAzHyl8*9hOX2j1Cf~!!-Ut`tS9+-69#t zc|r&LgM)5~x-(%|38EGs*<)dD4zU-d^A8)K*cbhIh^bV5h4h=7+uq^t!1w(xC!pKc z3rjdzlF8b{3?9|VD{sFh;C%F(Ql)78@yu(*|F6JhQFehjP|HbakE;o64J_axcIzv>c zdLfg~IfiCa`3U!jyZsM5%_D^Ksn{KVNd7&w7$pVyk(!~~y;uZ}S zn2gpI+#K@U;*mXe`BV7U@80taWxvlhH_J%e=d9PQbbdMuXkQ6m3`N@#@L$89ef_7 zq>X@$yuW{Pc6M`f>SN&N2)H<}sSFg#p^0T&jn5%GR;_26?EAPQoV#mz_jXqO%fH*6zR`V#<~1RWNr z+61hLb75?0^RTtGQQW&2U>_nN@}SU>#_=P9FjuYeIS)Strp!Yq8YnoD7dkPd2|DT=n}^ zvMxd6B!sVH_?HJ=oHx9JInY_x&o|(Q?u#T;*x2y=L(2`v$8SMr5pz>t-;{?D;l=im zD@!r`WAN!y6i)1Z133t+WO{4%*nsH@>BJ1c3?Qq2vXv`!7**4Fd87M9TGM?adKndZm%{5KdTJMh0L`1`#c3C;zWeR;0lcRvh$ z=Y+%Kb@6jO_xWsmG$P$o$m+D+D}0>NFj~&2fGX z2NtPs{95zCHrFEVZqFv*UuZ2^rXaZl(Gb1}dgGVNhbIBhW(06L|5N&#(J(;y8*CP# zOM$WYdKRerSAJREaM5d6fYD!5+RoLRCRv6hGD|f0M?TW4`rk|8v_gi);sbv%Al&_) zCAbpT)BY;(dew5dvVVFO+^{>~_6JJnziW^8_q(-P*-!Kz@Bg+N2iFb1K#ixeS51HX zRwjPq7m9~bd9?btHJ8o5u%}bGJ&nyG185#+6Zny;?`q|8ucrWZ_!bt*L0-AtK0WFj z*$zRgG?x`W_TO_Zsylx3#G)^%GaBcK7snhdFMemM76$X{0#P z9cIyg6Z?wP=S<-A#IWT86YVSg2aS6174S4G=tqK(2_c9+V#8zE)M{x*ZtF{Gn%PJD zN0bfv0%u{s@uUg*
qugV7)m;l?{e4(hLw_uId*jUf!qar}9%+Ae8fAi2cRT`%l zUJ@qYYqC|Eh~AA_j~e;|PY5Ut=V_(cuVgpNYVea#e}%`OTP!zw#t-x;5GLS55Di1I z(Sx9FqqzAF^;Fu(!qozs?5>NbP{CUCKXd4B72={%EBZ%xXvqG!{OtS_1Dsd$KCL+h z*rBafeh>!tSo7K0Kde-m*59_ACh2dkUMymOULXC*zqq(e zKnQ<1$E}gWu#G#e6Th26m-Xp_ijjep=EmnA0fAI47Jcd8t?lk!DM9O7HmOVN>^$#V zlgK{YKd>jhdHF&T=u;_@hh&wwjhmpqfcpN9!*5szbV&`kqO_@#-Y5{l0UKOwA+*sy z|Ni>%O!d96^;?i%D+8JnQL5=8$^V-pAJ zoe5w1qdhT%{$H;bv`}IVKnfy3V1P{q`2B{TFVhz|^?99uuWBxDLw{Om9B^+y2~ggX z{-|82xE#ms7F|2|fI|@BT_`kPSqha2Cio}+mlh`a-y%TxVF%@6ObL&ixncQ%n?4+) zzrnxPobz>GH8Qloc>UQBGJ;5l5cE3F^|T18VOktm24Wqc6>u&G{Uo^E7ccfSW!3>~ zj>y1pG%>yi7J8tI^J>-fr^Ar}-r?m}SI_;LC}E}H+VtGQZxC-+C}_G>Qe0r#|3rQ> z{&98be=2@9-%EdDXm_{zwcC%=GGL2DT|)gmR(y~l-udu-hRqW5Mu&xY=Cb4&Pg z5jnX8C;2*U zik7fvz1q&E{SQjzS1hnw7C|n=#`B{*HrRUy(|Hv4$nYw%&c|hiYQz6kVS67hkssbr zf7}iy2@tyx!AF4$;EDYY?$2f%@Y(hCLP5KSG5p?MzkiOGe?g&@k7xz5`9cDS5A?sN zepPI0?QbH+^M7@PBj#C8<0x|*8w-Tc+~)3{vamesf;w36SzlTXJ9}gNOM>$2fF7dk zN&w==;p548y0iyg3(_azp9qHDYpM)=0s`7fK5FH~q(Yv0gGN&lPPn@#Gk>JKmI&qHE#-p&AH^%s-IzVWl+Rq9M2 z|1C9MS|R|DceKi{PH1&7aD)Cr?TZ2cg5K0>#lyhG?*#p?-phA1p3Kb_4-ZRMDL!8P0llm)%f-Zgh zgf9AERDWY`&>#Zf$N7)Qp@C%9bN~%Dcib)5$^2`=;Pf$8(eJ8;SO;N}wG`{0H%k5i zN}l0An@Z4vSC6Wd8$n|p`jhy!USX9{_q*L4*;fYC5OK8c`C7PxWAW>L(r@$~1dY2N yCi{LGpBVVWz$XSiG4P3jPYirw;1dI%82H4%Ck8$-@QHy>418kX69fM`2L2gyh~}{X literal 0 HcmV?d00001 diff --git a/broadcast/index.frm.php b/broadcast/index.frm.php index bc0ebe3..3a6b53f 100644 --- a/broadcast/index.frm.php +++ b/broadcast/index.frm.php @@ -53,9 +53,11 @@
- + 〜 - +
diff --git a/broadcast/index.php b/broadcast/index.php index 12773e8..2e69fab 100644 --- a/broadcast/index.php +++ b/broadcast/index.php @@ -12,6 +12,9 @@ $length = (int) ($_GET['max'] ?? 20); $asc = ($_GET['asc'] ?? 0) != 0; $keyword = trim ($_GET['q'] ?? ''); +$date_start = $_GET['start'] ?: null; +$date_end = $_GET['end'] ?: null; + $f = fopen (LOG_PATH, 'r'); if ($f !== false) @@ -40,6 +43,18 @@ if ($keyword != '') !== false)); } +if ($date_start) + { + $log_data = array_filter ($log_data, fn ($row) => ( + substr ($row['date_time'], 0, 10) >= $date_start)); + } + +if ($date_end) + { + $log_data = array_filter ($log_data, fn ($row) => ( + substr ($row['date_time'], 0, 10) <= $date_end)); + } + $pages_max = (int) ((count ($log_data) - 1) / $length) + 1; if (!($asc)) diff --git a/broadcast/script.js b/broadcast/script.js index 447cf8e..101b14d 100644 --- a/broadcast/script.js +++ b/broadcast/script.js @@ -4,8 +4,11 @@ Script static main () { - $ ('#filter-date-start').datepicker (); - $ ('#filter-date-end').datepicker (); + const dateOptions = {dateFormat: 'yy-mm-dd', + firstDay: 6}; + + $ ('#filter-date-start').datepicker (dateOptions); + $ ('#filter-date-end').datepicker (dateOptions); const url = new URL (window.location.href); @@ -17,6 +20,14 @@ Script const filter = ( function (e) { + let dateStart = $ ('#filter-date-start').val (); + let dateEnd = $ ('#filter-date-end').val (); + + if ((dateStart !== '') + && (dateEnd !== '') + && (dateStart > dateEnd)) + [dateStart, dateEnd] = [dateEnd, dateStart]; + url.searchParams.delete ('p'); url.searchParams.delete ('asc'); @@ -25,6 +36,15 @@ Script url.searchParams.delete ('q'); url.searchParams.append ('q', filterKeyword.value); + url.searchParams.delete ('start'); + url.searchParams.delete ('end'); + + if (dateStart !== '') + url.searchParams.append ('start', dateStart); + + if (dateEnd !== '') + url.searchParams.append ('end', dateEnd); + window.location.href = url; }); From 71d0c12564414676c92854bec11016e025f26a1b Mon Sep 17 00:00:00 2001 From: miteruzo Date: Sun, 17 Dec 2023 08:32:25 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AD=A6=E5=91=8A=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broadcast/index.frm.php | 12 ++++++------ broadcast/index.php | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/broadcast/index.frm.php b/broadcast/index.frm.php index 3a6b53f..2f38220 100644 --- a/broadcast/index.frm.php +++ b/broadcast/index.frm.php @@ -3,11 +3,11 @@ - - - - - + + + + + 伊地知ニジカ放送局 - ニジカ返答ログ @@ -120,7 +120,7 @@ - + diff --git a/broadcast/index.php b/broadcast/index.php index 2e69fab..7448458 100644 --- a/broadcast/index.php +++ b/broadcast/index.php @@ -12,8 +12,8 @@ $length = (int) ($_GET['max'] ?? 20); $asc = ($_GET['asc'] ?? 0) != 0; $keyword = trim ($_GET['q'] ?? ''); -$date_start = $_GET['start'] ?: null; -$date_end = $_GET['end'] ?: null; +$date_start = ($_GET['start'] ?? null) ?: null; +$date_end = ($_GET['end'] ?? null) ?: null; $f = fopen (LOG_PATH, 'r'); From 7852c03368731236611bd9e3f56393a351945fd8 Mon Sep 17 00:00:00 2001 From: miteruzo Date: Sun, 18 Feb 2024 16:06:34 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E7=B5=9E=E8=BE=BC=E3=81=BF=E3=81=AE?= =?UTF-8?q?=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- broadcast/index.frm.php | 10 ++++++++-- broadcast/script.js | 7 +++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/broadcast/index.frm.php b/broadcast/index.frm.php index 2f38220..08d1462 100644 --- a/broadcast/index.frm.php +++ b/broadcast/index.frm.php @@ -73,8 +73,14 @@ -
- +
+
+ +
+ +
+ +
diff --git a/broadcast/script.js b/broadcast/script.js index 101b14d..a8171ad 100644 --- a/broadcast/script.js +++ b/broadcast/script.js @@ -48,6 +48,12 @@ Script window.location.href = url; }); + const resetFilter = ( + function () + { + window.location.href = '/'; + }); + filterKeyword.addEventListener ('keydown', function (e) { @@ -56,6 +62,7 @@ Script }); btnFilter.addEventListener ('click', filter); + $ ('#btn-reset').on ('click', resetFilter); } static