From d33129a325fbf5912c67ecf2db6d18c03fa26b93 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Thu, 24 Dec 2020 06:27:40 +0000 Subject: [PATCH] --- BO/Content/file/users.xlsx | Bin 14880 -> 13991 bytes BO/Controllers/croomController.cs | 10 +- BO/Web.config | 3 +- BO/obj/Debug/BO.csprojAssemblyReference.cache | Bin 43009 -> 15527 bytes Base/Controller/BaseController.cs | 129 ++++++++++++------ .../Debug/Base.csprojAssemblyReference.cache | Bin 130268 -> 8781 bytes Dao/MyBatis/Maps/CRoom.xml | 5 +- .../Debug/Dao.csprojAssemblyReference.cache | Bin 44296 -> 4091 bytes FO/Controllers/CRoomController.cs | 4 +- FO/Views/Home/Index.cshtml | 55 +++++++- FO/Web.config | 2 +- 11 files changed, 153 insertions(+), 55 deletions(-) diff --git a/BO/Content/file/users.xlsx b/BO/Content/file/users.xlsx index c1494671738c1f6aa3eb71151cce169cf0bf1342..e12db9cd0d307f68fcce581ef313201231a61037 100644 GIT binary patch delta 10276 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≶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 + - + diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index 16333dcdba3e75251b13f142f9606ad4b5a3ce9a..49f8797dece59469b416f51eddb11580203eac42 100644 GIT binary patch literal 15527 zcmeI3Uu+yl9mj9(Ztrf^Nu5+Q{gVPtDWwo|wz1tL7HN{6?Zz~A>^QiAI5B&7d*`+H zZm+w0P90jMO$8)^7WEGTih!UZDxp?FfCRj>FRg^&1*9S&c!3w5$^);w!1udz>#V(3 zh@lUyv_Hw;+a1sRW_I?oGrK##O^H-0^)DEIX*<%8^V3$vbv&o$7awR_cC~og@K(KI z$#Kp8z6I0uET?&RXtX#~94rp@_m$eV-*(NzO|$L0hTY#c+b-KyP81`-X2am#kT~8SG{5RR2ONY}>5(Xo6QfZg|VS zQMOICT4o?w%74t7Lk9hXV^k-Nito7j&hhl1xh1F3GF;Ow(C@r;(aa*z%Pkmo+w@YY zOiI&w3VS;3IO$fcreSZCd3)~Qk)X+0RKQk9jl$}(OnQfMEYh=N)tl(tlHr*tA$GAK z({p*qz2jqxEq7({b2C$=(-VsiAkSjiYA%kO<#v5>X12(bV%4^Hv8td21#D=P{r|O- z_fLi$tRsJ>;Z(EuTTL6yY}IUeIgcm6(_DYebknt_R%@cavbE+^HCJoQx=xKpmlLUs z5VFv}wYvFbbZ51A%=64f*uecPiZP$vGUkhK4#Y?vIOw>g^E)( z%Q%bqRdc;%SgvMx^S+z6ym|JR&XTS6F*uP{qtOn4FSusIXtm60N~H6oEtScLG&>+I z(p$QyP!NUDjjN|wv+8Zv-~|+(7|Zm+&GqA|b&hNK%Z*RpXsOQ0P{(7HE!*D9?htm2w;9cFG-;y_7pCAEbPU@?lCJWgq1(%10=7Q$9+$hw?GXy_Anr zJ^|Uy3yzlMHMRvp4uQF)X=BB4@nd1Q%Pj?yi(EQou2~!rShN5OvSOR_60MiW(9(k3 z&^gaY)OPI0-pmHA(RqrO{tb0?`M?2Vv@&|%(4pZGbMW9Hja{~_j(!h~1?e=;diFgu z7W`anoSy3w_=9HCbgfD-kI`nxm9yx+n46lf@5hM2}( zfUV16?8*^HXbP;~M#1_`9IOM#u5oBjz)HYUBi2FC5YEC6o8{v4T1A(KkSNC>p((uH zjNqTb5EA4GNN5VJpGDF7X&kMS$gc7EIYBEyOQAIj8gdFPUCv=go`Qs?uzEF$ z)hltVK8x%c-^e6bC0Hq}7C=K!XT%yed_$KHBSoHpgr?YfIm*_L;%uEoc8xFk61Eby z6kCg+;g;*OVR2)b#?$3F{7;^Tgr+F_L6ovr2S4 zF`OvjE8$D=^<~hIpF70`MOT+!!JfPV2~BZzA(l83n8w2kg7Zt}#$M0W1Mb z0rox6aL1Or`QoJGHVoenX2|a&gS-X_O`*0FMeTeXwU>~+mm$&x{H1?!adF}Hk-uCO zjF;YtzbyWurZFt~{TaubLCeE$$O;=DgO!YyQNcGbIMPDwBdji8MTG@DZ=|ICDYh(Lqf)So^ z2Mps29PG{f?UjG*Iq8X`NTCB7SEOky2qq?KsHcmmd`HG|~i@#NrOP2D14OxFFKC1&yu___8~2 zuy_2gZ{4%|%s#<4-*i9%2@qRB6MVrPZvo$H1`eK|d;GPPqc{Ik@Fgc5uyE*v6bin} zj62|~D_UCc{Z-ed^EFkx;FCxVYTf|o@;f=;dx*FLK77*B;tDi8W;T_*PZNC5j2CL5Y1fTRy;_FF#+{l`G{tc29OPK%w literal 43009 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 diff --git a/Base/Controller/BaseController.cs b/Base/Controller/BaseController.cs index dc6bae2..244a100 100644 --- a/Base/Controller/BaseController.cs +++ b/Base/Controller/BaseController.cs @@ -420,53 +420,100 @@ namespace NP.Base System.Net.WebRequest request; System.IO.Stream dataStream = null; System.Net.WebResponse response = null; - try + if(GetConfig("isstaging") == "1") { - if (GetConfig("isstaging") == "1") + try { + request = System.Net.WebRequest.Create(GetConfig("fronturl").Replace("https://", "http://") + "/Open/" + fmtype); - } - else - { - request = System.Net.WebRequest.Create(GetConfig("fronturl") + "/Open/" + fmtype); - } - request.Method = "POST"; - //request.PreAuthenticate = true; - //request.UseDefaultCredentials = false; - string postData = "This is a test that posts this string to a Web server."; - byte[] byteArray = Encoding.UTF8.GetBytes(postData); - request.ContentType = "application/x-www-form-urlencoded"; - request.ContentLength = byteArray.Length; - dataStream = request.GetRequestStream(); - dataStream.Write(byteArray, 0, byteArray.Length); - dataStream.Close(); - response = request.GetResponse(); - //Console.WriteLine(((HttpWebResponse)response).StatusDescription); - dataStream = response.GetResponseStream(); - reader = new System.IO.StreamReader(dataStream); - string responseFromServer = reader.ReadToEnd(); - //Console.WriteLine(responseFromServer); - reader.Close(); - dataStream.Close(); - response.Close(); - return true; - } - catch(Exception ex) - { - SetError("FrontMemnu()" + ":" + Request.Url + ":" + ex.Message + ex.StackTrace); - if (reader != null) - { - reader.Close(); - } - if (dataStream != null) - { + //request = System.Net.WebRequest.Create(GetConfig("fronturl") + "/Open/" + fmtype); + request.Method = "POST"; + //request.PreAuthenticate = true; + //request.UseDefaultCredentials = false; + string postData = "This is a test that posts this string to a Web server."; + byte[] byteArray = Encoding.UTF8.GetBytes(postData); + request.ContentType = "application/x-www-form-urlencoded"; + request.ContentLength = byteArray.Length; + dataStream = request.GetRequestStream(); + dataStream.Write(byteArray, 0, byteArray.Length); + dataStream.Close(); + response = request.GetResponse(); + //Console.WriteLine(((HttpWebResponse)response).StatusDescription); + dataStream = response.GetResponseStream(); + reader = new System.IO.StreamReader(dataStream); + string responseFromServer = reader.ReadToEnd(); + //Console.WriteLine(responseFromServer); + reader.Close(); dataStream.Close(); - } - if (response != null) - { response.Close(); + return true; } - return false; + catch(Exception ex) + { + SetError("FrontMemnu()" + ":" + Request.Url + ":" + ex.Message + ex.StackTrace); + if (reader != null) + { + reader.Close(); + } + if (dataStream != null) + { + dataStream.Close(); + } + if (response != null) + { + response.Close(); + } + return false; + } + } + else + { + bool result = true; + foreach(var d in GetConfig("adminips").Split(';')) + { + try + { + request = System.Net.WebRequest.Create("http://"+d + "/Open/" + fmtype); + //request = System.Net.WebRequest.Create(GetConfig("fronturl") + "/Open/" + fmtype); + request.Method = "POST"; + //request.PreAuthenticate = true; + //request.UseDefaultCredentials = false; + string postData = "This is a test that posts this string to a Web server."; + byte[] byteArray = Encoding.UTF8.GetBytes(postData); + request.ContentType = "application/x-www-form-urlencoded"; + request.ContentLength = byteArray.Length; + dataStream = request.GetRequestStream(); + dataStream.Write(byteArray, 0, byteArray.Length); + dataStream.Close(); + response = request.GetResponse(); + //Console.WriteLine(((HttpWebResponse)response).StatusDescription); + dataStream = response.GetResponseStream(); + reader = new System.IO.StreamReader(dataStream); + string responseFromServer = reader.ReadToEnd(); + //Console.WriteLine(responseFromServer); + reader.Close(); + dataStream.Close(); + response.Close(); + } + catch (Exception ex) + { + SetError("FrontMemnu()" + ":" + Request.Url + ":" + ex.Message + ex.StackTrace); + if (reader != null) + { + reader.Close(); + } + if (dataStream != null) + { + dataStream.Close(); + } + if (response != null) + { + response.Close(); + } + result = false; + } + } + return result; } } } diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache index 2039defb7726c7f08d85e76ab13eeba85684804d..a1f835acf6a8bdf91e8d232fd748e843359f9c9c 100644 GIT binary patch literal 8781 zcmeI2&u<$=6vsVluf4NrNs6Gfw1pH<`O#n}O42r=QAzWoiCUYqj!H|DhOs?%wps6* z-F0Xxq;l;)z?BOK2`(TZdVvcCR5*Zyio}l#+}pna-gnoVIN1OV^w3KCBtP$tXWsn! zyqVoMPOwBG@h1tsA=?yE7xPBhv0c0BWsf%vvyz<^?vk4wvmM#feO5ZIVOt}8gW0}p zZ??Cmd#q`CO-GJcvgtX(?CG9qmQ163Qm)L}OVS!C_4Zc>tB0$7eU-sp(Jxd~wtw?F ziYu-s>qSp^61jNQFr|N&+#CEvtuRel_NWPNc1pO5o+z0Tt>#HmDX4$Unx+i;DO*$~ zMcK2ROshW~)Z8(<-Vly-G}tW~S7eG3-Sk;uHl>?LBonIIq3vw7;}xf3Si)Q_bNlp> zV}6rUQ~_GSRVY-KLek%qLy?XJqh`_IjtN&L80$hoq^C2a4vY`aHJnRx=L^$gvlDaU z!k#M`*4(%(HEVN)nJgt_E2i0niv0RDx=^7G{_7AQoD7For~JvfT}jbrNfB16A{%bn z#qhhT<1I@^sak5)qR~oKt?5d-TAy+3D*BdYi6moO>)BXcagheIk{xwjSudF@1yPq1 zmpy3#A52(wD+MmhqX>JbHTtbtL)y8we*ERu2S00m=Q$;CbcT13N^c{jFAor>{k{Et zLyT`n>O-WqXA2XvlMc1%P1{*YcT!S9Md>Yd<6)Fq6z*stWsxbRv6O5qc}W^BwQ7o* zn<+P%!YMBz&)Bq5HZpXvIBM27W%1GRw6a~1C7Sunl3ZyB!%>A>^qh?07BONvN;aCK zWP}^_deg^Ub7WmK8nTjLN(QVYl1Zju02HQd7$Qw$+Tg11SXHCebOhWdoESs8;pNIy z&^p^Oyv6#_yDin4jG#Y8$uJFXg)!z&Sh|Z^l@2)7`3}0_7&Hjl%dV12-JuoezqJuI zGRtt#g@uHcdYg>hCS(7v>FaEwhV-MPvT%msTrM|0oFj+K1rC`b|I3j>=6r|DtvRHg z-bsZmR`tu{sGy0WJtvTY-!l;Bd=Bz%wg(2^6F37 z>h!E_#3!UB9i!}T$VKVB-gn``Ru=c3?v1(c?GwlRJh%$hqo?RftGi{}F^!VWpQc;> z45?836^Z>uykb>CD*Kf#u&RJoUH5mFXX#RfQ^jDJwR^K&Jm_FOM>J$iyEb4+Pv_6m z9e;sTC;?YLwR3eV%GHaMUBx;ba}{$HELd5hp`*3tjtfudJVz?+=TW2$1R0;(p7hIH_hrSlVX!>34v5@2<`9jnixSe>NoDq<-y zRxwrqR;P%D@ZlZjCpynl3NMffC1C55cD6o_vUQrWs|eA>Y{hH^Y@Hz*9+^H)!F;zM zJ^wi?k5d6h=SBL7&yoryfb64o$Uclh_9|spyGg~6#gGM%og*5$)*z!Zp1N)6{5&P| z*GPpD0QP=6VDCi%o2TrZ2)SzXQLbN^JG*<}_iGICR~!f6#GqYNgjpZVxFAmD!n0*< z^^kZ>G(?$B$Ec@T$)EqH=b*Y|m70?CaB8IJj~A14%1wvR^fT-D3mVK!Gynhq literal 130268 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 p.cdt >= #cdts# and p.cdt <= #cdte# - and (p.rstatus =0 and pr.rstatus=0 and pri.rfdno is not null) + $pstatusall$ @@ -830,7 +830,6 @@ left outer join book bk on a.isexamready=0 and pi.ptype=2 and bk.bkno=pi.itemno left outer join exam ex on a.isexamready=0 and ex.exno=pi.itemno left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno - where (pri.rfdno is null or pr.rfdno is not null) ) a order by a.rno diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index b19b8d59d77d5d4fe4ef126dabebe90e1402c7f4..f38f71299944c0c56133ae286cc6ae43567c59c9 100644 GIT binary patch delta 781 zcmeCU#q?W#gFhn|BLf2iCkv2Zo*c>O$jCT(HlwkC02@#MEW-h0uyRbE$o9(TtXJC2 zE6ZX#s%z8sb)zn44OjUzE+p z4-{fx<(!;oynAws;0!GRAeX~0K+iWnB{heOQxM4I6auLM0+21E4C{WyJ@;^DT$^V4p7{w;b3VU#Y+ymCdJUKwlOi~=k2PGgFupND_z{*`$FaM{aR) zeo;OvLqgFJ|86v(&OjA8_NN&$#L0AT>gAE*X^JcZQ&9WkJc0uX}$+yqu# QV3HP@EU-X&^5ZqC0PB#7z5oCK literal 44296 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 diff --git a/FO/Controllers/CRoomController.cs b/FO/Controllers/CRoomController.cs index 29fea6e..6753156 100644 --- a/FO/Controllers/CRoomController.cs +++ b/FO/Controllers/CRoomController.cs @@ -35,8 +35,8 @@ namespace NP.FO.Controllers } } vm.Datas = Dao.Get("cr.main.boardalarm", new System.Collections.Hashtable() { { "bmnos", bmnos != null ? bmnos.Substring(1) : bmnos},{ "lect", vm.croomlectno },{ "cmno", vm.croomcmno }, { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }); - vm.LectInnings = Dao.Get("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy"+(Request.IsLocal?"x":""), 1 },{ "limit", 6} }); - if (!string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) + vm.LectInnings = Dao.Get("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy" + (Request.IsLocal ? "x" : ""), 1 },{ "limit", 6} }); + if (vm.LectInnings.Count() > 0 && !string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.FirstOrDefault().isrebate == 1) { vm.intval = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); } diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml index ff0ada6..227e2a1 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -219,10 +219,37 @@ } - + function hppopclick(url) { + url = url.toLowerCase().replace('http//', 'http://').replace('https//', 'https://'); + if (url.toLowerCase().indexOf("http://") == 0 || url.toLowerCase().indexOf("http://") == 0) { + window.open(url); + } + else if (url != "") { + location.href = url; + } + } + var _hide7; + function hide7(id, pno) { + _hide7 = id; + capp("/focommon/hidepop", { pno: pno }, "cbhide7"); + } + function cbhide7() { + hidepop(); + $("#" + _hide7).remove(); + } + function hidepop() { + if ($(".popupitem").length == 1) { + $("html").css("overflow", "auto"); + } + } + +} diff --git a/FO/Web.config b/FO/Web.config index d4e041a..e125c57 100644 --- a/FO/Web.config +++ b/FO/Web.config @@ -343,7 +343,7 @@ - +