diff --git a/BO/Content/file/users.xlsx b/BO/Content/file/users.xlsx
index c149467..e12db9c 100644
Binary files a/BO/Content/file/users.xlsx and b/BO/Content/file/users.xlsx differ
diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index c356d57..dc53c1d 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -560,17 +560,17 @@ namespace NP.BO.Controllers
ht.Add("cdts", vm.stringval);
ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59"));
- ht.Add("pstatusin", vm.stringval3);
- ht.Add("isrefundcall", string.IsNullOrEmpty(vm.stringval4) ? null : "1");
- ht.Add("rstatusin", vm.stringval5);
+ //ht.Add("pstatusin", vm.stringval3);
+ //ht.Add("isrefundcall", string.IsNullOrEmpty(vm.stringval4) ? null : "1");
+ //ht.Add("rstatusin", vm.stringval5);
String pstatusall = null;
if (vm.stringval3 != null)
{
- pstatusall = " and (p.pstatus in (" +vm.stringval3+")";
+ pstatusall = " and ((p.pstatus in (" +vm.stringval3+") and pr.rstatus is null and p.rstatus = 0)";
}
if (vm.stringval4 != null)
{
- pstatusall = pstatusall == null ? "and (pr.rfdno is not null" : (pstatusall + " or pr.rfdno is not null");
+ pstatusall = pstatusall == null ? "and ((pr.rfdno is not null and pr.rstatus = 0)" : (pstatusall + " or (pr.rfdno is not null and pr.rstatus = 0)");
}
if ((vm.stringval5??"").Contains("1"))
{
diff --git a/BO/Web.config b/BO/Web.config
index 06dad23..86f6ba4 100644
--- a/BO/Web.config
+++ b/BO/Web.config
@@ -32,8 +32,9 @@
+
-
+
diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache
index 16333dc..49f8797 100644
Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ
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 2039def..a1f835a 100644
Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 72849bf..c096da8 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -769,12 +769,12 @@
left outer join cg cg on cg.cgno=cm.cgno
left outer join book bk on pi.ptype=2 and bk.bkno=pi.itemno
left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
- where p.pstatus in (1,21,22,41,42,43) and (pri.rfdno is null or pr.rfdno is not null)
+ where p.pstatus in (1,21,22,41,42,43)
and 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 b19b8d5..f38f712 100644
Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ
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 @@
-
+