diff --git a/Project/Web/Controller/DashBoardController.cs b/Project/Web/Controller/DashBoardController.cs index 86ff028..9aa8a63 100644 --- a/Project/Web/Controller/DashBoardController.cs +++ b/Project/Web/Controller/DashBoardController.cs @@ -1,6 +1,7 @@ using FCOMMON; using Newtonsoft.Json; using System; +using System.Data; using System.Linq; using System.Net.Http; using System.Security.Cryptography; @@ -38,6 +39,77 @@ namespace Project.Web.Controllers } + [HttpGet] + public HttpResponseMessage GetHolydayRequestCount() + { + + try + { + var cn = DBM.getCn(); + + var sql = "select count(*) from EETGW_HolydayRequest" + + " where gcode = @gcode" + + " and conf = 0"; + + cn.Open(); + + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode; + var cnt1 = (int)cmd.ExecuteScalar(); + cn.Dispose(); + + var response = new + { + HOLY = cnt1, + Message = string.Empty, + }; + return CreateJsonResponse(response); + } + catch (Exception ex) + { + var response = new + { + HOLY = 0, + Message = ex.Message, + }; + return CreateJsonResponse(response); + } + + + } + + + + [HttpGet] + public HttpResponseMessage GetPurchaseWaitCount() + { + + try + { + FCOMMON.DBM.GetPurchaseWaitCount(FCOMMON.info.Login.gcode, out int cnt1, out int cnt2); + var response = new + { + NR = cnt1, + CR = cnt2, + Message = string.Empty, + }; + return CreateJsonResponse(response); + } + catch (Exception ex) + { + var response = new + { + NR = 0, + CR = 0, + Message = ex.Message, + }; + return CreateJsonResponse(response); + } + + + } + + [HttpGet] public HttpResponseMessage GetUserGroups() @@ -131,5 +203,21 @@ namespace Project.Web.Controllers return resp; } + private HttpResponseMessage CreateJsonResponse(object data) + { + var json = JsonConvert.SerializeObject(data, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }); + + return new HttpResponseMessage() + { + Content = new StringContent( + json, + System.Text.Encoding.UTF8, + "application/json") + }; + } + } } diff --git a/Project/Web/Controller/HomeController.cs b/Project/Web/Controller/HomeController.cs index c3b3a71..f7ef2d2 100644 --- a/Project/Web/Controller/HomeController.cs +++ b/Project/Web/Controller/HomeController.cs @@ -134,6 +134,10 @@ namespace Project.Web.Controllers return CreateJsonResponse(response); } + + + + [HttpGet] public HttpResponseMessage CheckLoginStatus() { diff --git a/Project/Web/wwwroot/DashBoard/index.html b/Project/Web/wwwroot/DashBoard/index.html index b9ec525..0f4cd52 100644 --- a/Project/Web/wwwroot/DashBoard/index.html +++ b/Project/Web/wwwroot/DashBoard/index.html @@ -105,7 +105,8 @@ -