diff --git a/Project/Controller/HomeController.cs b/Project/Controller/HomeController.cs deleted file mode 100644 index 5539ebd..0000000 --- a/Project/Controller/HomeController.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class HomeController : BaseController - { - [HttpPost] - public void Index([FromBody]string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - [HttpGet] - public HttpResponseMessage Login() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} diff --git a/Project/Dialog/fDashboard.cs b/Project/Dialog/fDashboard.cs index 3e1cfa6..217f5ae 100644 --- a/Project/Dialog/fDashboard.cs +++ b/Project/Dialog/fDashboard.cs @@ -61,15 +61,9 @@ namespace Project.Dialog // 시스템에 설치된 WebView2 사용 await this.webView21.EnsureCoreWebView2Async(); } - var fn = "intro.html"; - if (System.Diagnostics.Debugger.IsAttached) - fn = "dashboard.html"; - var fi = new System.IO.FileInfo($"view\\{fn}"); - if(fi.Exists) - { - webView21.Source = new Uri(fi.FullName); - label1.Visible = false; - } + // OWIN 서버의 DashBoard 페이지로 연결 + webView21.Source = new Uri("http://127.0.0.1:9000/DashBoard"); + label1.Visible = false; } catch (Exception ex) { diff --git a/Project/Dialog/fLogin_WB.Designer.cs b/Project/Dialog/fLogin_WB.Designer.cs new file mode 100644 index 0000000..5e780c5 --- /dev/null +++ b/Project/Dialog/fLogin_WB.Designer.cs @@ -0,0 +1,289 @@ +namespace Project.Dialog +{ + partial class fLogin_WB + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin)); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.listView1 = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); + this.label4 = new System.Windows.Forms.Label(); + this.cmbDept = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.tbID = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.tbPW = new System.Windows.Forms.TextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btLogin = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(405, 25); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(80, 80); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBox1.TabIndex = 3; + this.pictureBox1.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244))))); + this.panel1.Controls.Add(this.tabControl1); + this.panel1.Controls.Add(this.linkLabel1); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.cmbDept); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.tbID); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.tbPW); + this.panel1.Controls.Add(this.pictureBox1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(888, 639); + this.panel1.TabIndex = 0; + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Location = new System.Drawing.Point(16, 288); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(860, 327); + this.tabControl1.TabIndex = 13; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.listView1); + this.tabPage1.Location = new System.Drawing.Point(4, 32); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(852, 291); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "FAQ"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // listView1 + // + this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1}); + this.listView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(3, 3); + this.listView1.Name = "listView1"; + this.listView1.Size = new System.Drawing.Size(846, 285); + this.listView1.TabIndex = 13; + this.listView1.UseCompatibleStateImageBehavior = false; + this.listView1.View = System.Windows.Forms.View.Details; + this.listView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick); + // + // columnHeader1 + // + this.columnHeader1.Text = "제목"; + this.columnHeader1.Width = 836; + // + // tabPage2 + // + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(852, 301); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "PATCH"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // linkLabel1 + // + this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(806, 110); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(70, 23); + this.linkLabel1.TabIndex = 11; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "신규가입"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.label4.ForeColor = System.Drawing.Color.Teal; + this.label4.Location = new System.Drawing.Point(13, 257); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(243, 15); + this.label4.TabIndex = 10; + this.label4.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567"; + // + // cmbDept + // + this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F); + this.cmbDept.FormattingEnabled = true; + this.cmbDept.Location = new System.Drawing.Point(16, 136); + this.cmbDept.Name = "cmbDept"; + this.cmbDept.Size = new System.Drawing.Size(860, 41); + this.cmbDept.TabIndex = 9; + this.cmbDept.SelectedIndexChanged += new System.EventHandler(this.cmbDept_SelectedIndexChanged); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.ForeColor = System.Drawing.Color.Gray; + this.label3.Location = new System.Drawing.Point(13, 119); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(31, 15); + this.label3.TabIndex = 8; + this.label3.Text = "부서"; + // + // tbID + // + this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); + this.tbID.FormattingEnabled = true; + this.tbID.ImeMode = System.Windows.Forms.ImeMode.Alpha; + this.tbID.Location = new System.Drawing.Point(16, 205); + this.tbID.Name = "tbID"; + this.tbID.Size = new System.Drawing.Size(364, 41); + this.tbID.TabIndex = 3; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.label2.ForeColor = System.Drawing.Color.Gray; + this.label2.Location = new System.Drawing.Point(509, 187); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(31, 15); + this.label2.TabIndex = 4; + this.label2.Text = "암호"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.Color.Gray; + this.label1.Location = new System.Drawing.Point(13, 188); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(55, 15); + this.label1.TabIndex = 2; + this.label1.Text = "사원번호"; + // + // tbPW + // + this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbPW.ImeMode = System.Windows.Forms.ImeMode.Alpha; + this.tbPW.Location = new System.Drawing.Point(512, 205); + this.tbPW.Name = "tbPW"; + this.tbPW.PasswordChar = '●'; + this.tbPW.Size = new System.Drawing.Size(364, 40); + this.tbPW.TabIndex = 5; + this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.SystemColors.Control; + this.panel2.Controls.Add(this.btLogin); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 639); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(888, 82); + this.panel2.TabIndex = 6; + // + // btLogin + // + this.btLogin.Dock = System.Windows.Forms.DockStyle.Fill; + this.btLogin.Font = new System.Drawing.Font("맑은 고딕", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btLogin.Location = new System.Drawing.Point(0, 0); + this.btLogin.Name = "btLogin"; + this.btLogin.Size = new System.Drawing.Size(888, 82); + this.btLogin.TabIndex = 0; + this.btLogin.Text = "접속"; + this.btLogin.UseVisualStyleBackColor = true; + this.btLogin.Click += new System.EventHandler(this.button1_Click); + // + // fLogin + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.OrangeRed; + this.ClientSize = new System.Drawing.Size(888, 721); + this.Controls.Add(this.panel1); + this.Controls.Add(this.panel2); + this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fLogin"; + this.Text = "사용자확인"; + this.Load += new System.EventHandler(this.fLogin_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btLogin; + public System.Windows.Forms.TextBox tbPW; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox tbID; + private System.Windows.Forms.ComboBox cmbDept; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.LinkLabel linkLabel1; + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.ListView listView1; + private System.Windows.Forms.ColumnHeader columnHeader1; + private System.Windows.Forms.TabPage tabPage2; + } +} \ No newline at end of file diff --git a/Project/Dialog/fLogin_WB.cs b/Project/Dialog/fLogin_WB.cs new file mode 100644 index 0000000..cc49e72 --- /dev/null +++ b/Project/Dialog/fLogin_WB.cs @@ -0,0 +1,556 @@ +using FCOMMON; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Net; +using System.Net.NetworkInformation; +using System.Text; +using System.Windows.Forms; +using Microsoft.Web.WebView2.Core; +using Microsoft.Web.WebView2.WinForms; +using System.IO; + +namespace Project.Dialog +{ + public partial class fLogin_WB : fBase + { + private WebView2 webView21; + public fLogin_WB() + { + InitializeComponent(); + InitializeWebView2(); + this.tbID.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) tbPW.Focus(); }; + this.tbPW.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) btLogin.PerformClick(); }; + this.KeyPreview = true; + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + this.Text = string.Format("사용자 확인(v{0})", Application.ProductVersion); + + var lv = this.listView1.Items.Add("[25-04-06] 데이터베이스 이전 작업 완료 (버그신고:chikyun.kim@amkor.co.kr)"); + lv.Tag = "기존 데이터베이스 삭제 예정으로 인한 신규 데이터베이스 업데이트 작업 완료\n일부 기능에 문제가 발생할 수 있습니다. 문제 발생시에는 chikyun.kim@amkor.co.kr 로 문의 주세요"; + + + } + private void InitializeWebView2() + { + // 수동으로 WebView2 컨트롤 생성 + this.webView21 = new WebView2(); + + // 기본 속성 설정 + this.webView21.CreationProperties = null; + this.webView21.DefaultBackgroundColor = Color.White; + this.webView21.Dock = DockStyle.Fill; + this.webView21.Location = new Point(0, 0); + this.webView21.Name = "webView21"; + this.webView21.Size = new Size(800, 600); + this.webView21.TabIndex = 0; + this.webView21.ZoomFactor = 1D; + + // 폼에 추가 + this.Controls.Clear(); + this.Controls.Add(this.webView21); + + // 비동기 초기화 + InitializeAsync(); + } + + private async void InitializeAsync() + { + try + { + // Fixed Version 경로 설정 + string runtimePath = Path.Combine(Application.StartupPath, "WebView2Runtime"); + + if (Directory.Exists(runtimePath)) + { + var env = await CoreWebView2Environment.CreateAsync(runtimePath); + await this.webView21.EnsureCoreWebView2Async(env); + } + else + { + // 시스템에 설치된 WebView2 사용 + await this.webView21.EnsureCoreWebView2Async(); + } + // OWIN 서버의 DashBoard 페이지로 연결 + webView21.Source = new Uri("http://127.0.0.1:9000/Home/Login"); + label1.Visible = false; + } + catch (Exception ex) + { + MessageBox.Show($"WebView2 초기화 실패: {ex.Message}"); + } + } + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + EnsureVisibleAndUsableSize(); + } + + private void fLogin_Load(object sender, EventArgs e) + { + //EnsureVisibleAndUsableSize(); + var list = Pub.setting.lastid.Split(';'); + foreach (var item in list) + if (item != "") tbID.Items.Add(item); + if (tbID.Items.Count > 0) tbID.SelectedIndex = 0; + + + + //S1 사용자 그룹목록 확인 + //var tas1 = new S1ACCESS300Entities(); + //var deptlist = tas1.VIEW_CARD_PERSON + // .Where(t => t.CardStatusID == 0 && string.IsNullOrEmpty(t.CardUser2) == false) + // .GroupBy(t => t.PersonUser2) + // .OrderBy(t => t.Key) + // .ToList(); + + //this.cmbDept.Items.Clear(); + //foreach (var dept in deptlist) + // cmbDept.Items.Add(dept); + + + //그룹목록가져오기 + //Util.MsgE(Properties.Settings.Default.CS); + var tagrp = new dsMSSQLTableAdapters.UserGroupTableAdapter(); + //Util.MsgE(tagrp.Connection.ConnectionString); + var grplist = tagrp.GetData(); + this.cmbDept.DataSource = grplist; + this.cmbDept.DisplayMember = "dept"; + this.cmbDept.ValueMember = "gcode"; + + //마지막으로사용한 부서이름 + if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1; + else this.cmbDept.Text = Pub.setting.lastdpt; + if (cmbDept.SelectedIndex == -1 && Pub.setting.lastgcode.isEmpty() == false) + { + var dr = grplist.Where(t => t.gcode.Equals(Pub.setting.lastgcode)).FirstOrDefault(); + if (dr != null) cmbDept.Text = dr.dept; + } + //foreach (var item in dlist) + // if (item != "") this.cmbDept.Items.Add(item); + //if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0; + + this.Show(); + Application.DoEvents(); + + if (this.tbID.Text.isEmpty() == false) tbPW.Focus(); + else tbID.Focus(); + } + private void button1_Click(object sender, EventArgs e) + { + DateTime dt = DateTime.Now; + + //if(tbID.Text != "dev" && (dt.ToShortDateString() == "2025-04-05" || + // dt.ToShortDateString() == "2025-04-06")) + //{ + // Util.MsgE("4월 5일~6일은 데이터베이스 마이그레이션 기간이므로 프로그램 사용이 중단 됩니다\n문의 010-9155-9051 (EEDP:김치균)"); + // return; + //} + if (this.tbID.Text.isEmpty()) + { + tbID.Focus(); + return; + } + if (this.tbPW.Text.isEmpty()) + { + tbPW.Focus(); + return; + } + if (cmbDept.SelectedIndex < 0) + { + FCOMMON.Util.MsgE("소속 부서를 선택하세요"); + cmbDept.Focus(); + return; + } + + List idlist = new List(); + idlist.Add(tbID.Text.Trim()); + foreach (var item in this.tbID.Items) + if (idlist.Contains(item) == false) idlist.Add(item.ToString()); + + //List deptlist = new List(); + //deptlist.Add(cmbDept.Text.Trim()); + //foreach (var item in this.cmbDept.Items) + // if (deptlist.Contains(item) == false) deptlist.Add(item.ToString()); + + //180605 + var vuserlist = ""; + foreach (var item in idlist) + vuserlist += ";" + item; + + //var vdeptlist = ""; + //foreach(var item in deptlist) + // vdeptlist += ";" + item; + + var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow; + + Pub.setting.lastid = vuserlist;// tbID.Text.Trim(); + Pub.setting.lastdpt = cmbDept.Text; //부서저장 201006 + Pub.setting.lastgcode = gCode; + Pub.setting.Save(); + + var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); + var id = tbID.Text.Trim(); + //var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter(); + try + { + if (id.ToUpper().Equals("DEV") == false) + { + var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter(); + var drGrpUser = taGrpUser.GetbyID(gCode, id).FirstOrDefault(); + if (drGrpUser == null) + { + Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요"); + tbPW.SelectAll(); + tbPW.Focus(); + return; + } + else if (drGrpUser.level == 0) + { + Util.MsgE($"해당 계정이 활성화되지 않았습니다\n계정 담당자 문의하세요"); + tbPW.SelectAll(); + tbPW.Focus(); + return; + } + + //사용자테이블에서 암호를 확인합니다. + var taUser = new dsMSSQLTableAdapters.UsersTableAdapter(); + var drUser = taUser.GetID(id).FirstOrDefault(); + if (drUser == null) + { + Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요"); + tbPW.SelectAll(); + tbPW.Focus(); + return; + } + else if (drUser.password.Equals(encpass) == false) + { + Util.MsgE($"암호가 일치하지 않습니다.\n암호를 분실했을 경우에는 계정담당자에 초기화를 요청 하세요"); + tbPW.SelectAll(); + tbPW.Focus(); + return; + } + + //이사용자의 부서 코드확인 + //var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter(); + //var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow; + + var MaxVerstion = FCOMMON.DBM.GetMaxVersion(); + if (MaxVerstion.isEmpty() == false) + { + var curversion = Application.ProductVersion; + var verchk = curversion.CompareTo(MaxVerstion); + if (verchk < 0) + { + //내버젼이 낮다 + Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다"); + } + } + + FCOMMON.info.Login.no = drUser.id; + FCOMMON.info.Login.nameK = drUser.name; + FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; + FCOMMON.info.Login.level = drGrpUser.level; + FCOMMON.info.Login.email = drUser.email; + FCOMMON.info.Login.nameE = drUser.nameE; + FCOMMON.info.Login.hp = drUser.hp; + FCOMMON.info.Login.tel = drUser.tel; + FCOMMON.info.Login.title = drUser.dept + "(" + drUser.grade + ")"; + FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; + //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); + FCOMMON.info.Login.gcode = gCode;// gcode; + FCOMMON.info.Login.process = drUser.id == "dev" ? "개발자" : drGrpUser.Process; + FCOMMON.info.Login.permission = 0; + FCOMMON.info.Login.gpermission = int.Parse(gperm); + //FCOMMON.info.datapath = Pub.setting.SharedDataPath; + FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 + + + + } + else + { + if (tbPW.Text.Equals("123") == false) + { + return; + } + FCOMMON.info.Login.no = "dev"; + FCOMMON.info.Login.nameK = "개발자"; + FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; + FCOMMON.info.Login.level = 10; + FCOMMON.info.Login.email = ""; + FCOMMON.info.Login.nameE = "DEVELOPER"; + FCOMMON.info.Login.hp = ""; + FCOMMON.info.Login.tel = ""; + FCOMMON.info.Login.title = "업무일지 개발자"; + FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; + //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); + FCOMMON.info.Login.gcode = gCode; + FCOMMON.info.Login.process = "개발자"; + FCOMMON.info.Login.permission = 0; + FCOMMON.info.Login.gpermission = int.Parse(gperm); + //var datapath = FCOMMON.DBM.getCodeSavlue("55", "01"); + //FCOMMON.info.datapath = datapath;// Pub.setting.SharedDataPath; + FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 + } + + //if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524 + // FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$"; + //using (var dbEnity = new EEEntitiesMain()) + //{ + // var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault(); + // if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : ""); + // else FCOMMON.info.Login.process = drGrpUser.Process; + //} + + //로그인정보 기록 + AddLoginInfo(); + + //210221 + MakeAutoJobReportbyLogin(); + + //210613 + MakeAutoJobReportByAuto(); + + DialogResult = DialogResult.OK; + FCOMMON.info.Login.loginusetime = (DateTime.Now - dt).TotalMilliseconds; + } + catch (Exception ex) + { + Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요"); + DialogResult = System.Windows.Forms.DialogResult.Cancel; + } + } + + /// + /// 무조건 업무일지를 자동으로 작성하는 경우 + /// + void MakeAutoJobReportByAuto() + { + //누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다. + + var dbAI = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();// EEEntitiesMain(); + var dbGU = new dsMSSQLTableAdapters.vGroupUserTableAdapter();// EEEntitiesMain(); + var dbHL = new dsMSSQLTableAdapters.HolidayLIstTableAdapter(); + var dbJR = new dsMSSQLTableAdapters.JobReportTableAdapter(); + var taQuery = new DSQueryTableAdapters.QueriesTableAdapter(); + + var nd = DateTime.Now.ToShortDateString(); + + //이 날짜가 휴일인지 체크한다. + var Holyinfo = dbHL.GetData(nd).FirstOrDefault();// db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault(); + if (Holyinfo != null && Holyinfo.IsfreeNull() == false && Holyinfo.free == true) return; + + + //토,일은 처리하지 않음 + if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return; + + // db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); + var rows = dbAI.GetActiveList(info.Login.gcode, "A", "%", nd); + + foreach (var dr in rows) + { + //퇴사자 확인 + var userdata = dbGU.GetByID(FCOMMON.info.Login.gcode, dr.uid).FirstOrDefault();// db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault(); + if (userdata != null && userdata.IsoutdateNull() == false) continue; + + //오늘자 자동생성된 데이터가 있다면 처리하지 않는다 + if (taQuery.ExistAutoInputData(info.Login.gcode, dr.uid, nd) > 0) continue; //db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any()) + + //이데이터를 그대로 생성해준다. + var dtjr = new dsMSSQL.JobReportDataTable(); + var newdr = dtjr.NewJobReportRow(); + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.wuid = dr.uid;// FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = nd; + newdr.import = false; + newdr.hrs = dr.hrs; + newdr.type = dr.type;//210305 누락분 추가 + newdr.ot = dr.ot; + newdr.process = dr.process; + newdr.projectName = dr.projectName; + newdr.pidx = dr.pidx; + newdr.package = dr.package; + newdr.autoinput = true; + newdr.description = dr.description; + newdr.description2 = dr.description2; + newdr.remark = dr.remark; + newdr.requestpart = dr.requestpart; + newdr.status = dr.status; + newdr.tag = dr.tag; + newdr.uid = dr.uid; + dtjr.AddJobReportRow(newdr); + dbJR.Update(dtjr); + } + dbAI.Dispose(); + dbGU.Dispose(); + dbHL.Dispose(); + dbJR.Dispose(); + taQuery.Dispose(); + } + + /// + /// 로그인으로 업무일지를 작성하는 경우 + /// + void MakeAutoJobReportbyLogin() + { + //자동로그인 업무일지 기록 기능 추가 = 210220 + //select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L' + var nd = DateTime.Now.ToShortDateString(); + + var taQ = new DSQueryTableAdapters.QueriesTableAdapter(); + var exist = taQ.ExistAutoInputData(info.Login.gcode, info.Login.no, nd) > 0; + //var db = new EEEntitiesMain(); + + if (exist == false) + { + var taM = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter(); + var rows = taM.GetActiveList(info.Login.gcode, "L", info.Login.no, nd); + + //var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && + //t.enable == true && + //t.autoinput == "L" && + //t.uid == FCOMMON.info.Login.no && + //t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0)); + + var newjob = new dsMSSQL.JobReportDataTable(); + foreach (var dr in rows) + { + //이데이터를 그대로 생성해준다. + var newdr = newjob.NewJobReportRow(); + newdr.gcode = FCOMMON.info.Login.gcode; + newdr.wuid = FCOMMON.info.Login.no; + newdr.wdate = DateTime.Now; + newdr.pdate = nd; + newdr.import = false; + if (dr.IshrsNull() == false) newdr.hrs = dr.hrs; + if (dr.IstypeNull() == false) newdr.type = dr.type;//210305 누락분 추가 + if (dr.IsotNull() == false) newdr.ot = dr.ot; + if (dr.IsprocessNull() == false) newdr.process = dr.process; + if (dr.IsprojectNameNull() == false) newdr.projectName = dr.projectName; + if (dr.IspidxNull() == false) newdr.pidx = dr.pidx; + if (dr.IspackageNull() == false) newdr.package = dr.package; + newdr.autoinput = true; + if (dr.IsdescriptionNull() == false) newdr.description = dr.description; + if (dr.Isdescription2Null() == false) newdr.description2 = dr.description2; + if (dr.IsremarkNull() == false) newdr.remark = dr.remark; + if (dr.IsrequestpartNull() == false) newdr.requestpart = dr.requestpart; + if (dr.IsstatusNull() == false) newdr.status = dr.status; + if (dr.IstagNull() == false) newdr.tag = dr.tag; + if (dr.IsuidNull() == false) newdr.uid = dr.uid; + newjob.AddJobReportRow(newdr); + } + + if (newjob.Count() > 0) + { + var taJ = new dsMSSQLTableAdapters.JobReportTableAdapter(); + var cnt = taJ.Update(newjob); + //db.SaveChanges(); + Util.MsgI($"{cnt} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" + + "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다"); + } + } + } + + void AddLoginInfo() + { + string ip = string.Empty; + string hostname = Dns.GetHostName(); + string fullname = System.Net.Dns.GetHostEntry("").HostName; + + var nif = NetworkInterface.GetAllNetworkInterfaces(); + var host = Dns.GetHostEntry(hostname); + foreach (IPAddress r in host.AddressList) + { + string str = r.ToString(); + + if (str != "" && str.Substring(0, 3) == "10.") + { + ip = str; + break; + } + } + + if (ip == "" || hostname == "") return; + + try + { + var ta = new dsMSSQLTableAdapters.EETGW_LoginInfoTableAdapter(); + ta.Insert(FCOMMON.info.Login.no, DateTime.Now, ip, fullname, info.Login.no, DateTime.Now); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + Console.WriteLine(ex.Message); + } + } + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); + } + + private void cmbDept_SelectedIndexChanged(object sender, EventArgs e) + { + //부서명이 변경되었다 + label4.Text = "문의) 정보없음(?)"; + var sel = cmbDept.SelectedItem as DataRowView; + if (sel == null) return; + var dr = sel.Row as dsMSSQL.UserGroupRow; + if (dr == null) return; + + var admin = dr.managerinfo; + if (string.IsNullOrEmpty(admin)) + admin = "--"; + + var dev = dr.devinfo; + if (string.IsNullOrEmpty(dev)) + dev = "chikyun.kim@amkor.co.kr(T8567)"; + + label4.Text = $"문의) 관리:{admin},개발:{dev}"; + + } + + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //if (System.Diagnostics.Debugger.IsAttached == false) + //{ + // Util.MsgE("이 기능은 준비중 입니다"); + // return; + //} + + var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow; + FCOMMON.info.Login.gcode = gCode; + FCOMMON.info.Login.no = "new"; + FCOMMON.info.Login.dept = this.cmbDept.Text; + + var dlg = FCOMMON.Util.MsgQ($"현재 선택된 그룹[{this.cmbDept.Text}]의 사용자를 추가할까요?\n" + + "추가된 사용자는 담당자로부터 승인 완료되어야 접속이 가능 합니다\n" + + "사용자 추가 후 그룹담당자에게 문의 하시기 바랍니다"); + if (dlg != DialogResult.Yes) return; + var f = new _Common.fAddNewUser(cmbDept.Text, string.Empty, 0);//.fUserInfo(); + dlg = f.ShowDialog(); + if (dlg == DialogResult.OK) + { + tbID.Text = f.tbId.Text.Trim(); + } + } + + private void listView1_MouseDoubleClick(object sender, MouseEventArgs e) + { + var lv = this.listView1.FocusedItem; + if (lv == null) return; + if (lv.Tag == null) return; + var msg = lv.Tag.ToString(); + Util.MsgI(msg); + + } + } +} diff --git a/Project/Dialog/fLogin_WB.resx b/Project/Dialog/fLogin_WB.resx new file mode 100644 index 0000000..0f2f96b --- /dev/null +++ b/Project/Dialog/fLogin_WB.resx @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb + rQAAG60BIeRSlQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAeaSURBVHhe7Vrr + bxRVFK9+8ItRY/Qf8BE1auIravykRpjdlvcbFCMkxsREfACKxmCqobszW55CUikgL5ECkoLQIkTjB9md + 2W6rQmm7te1SmijvtpQ3FMZzZs+F6fYMULZ3d7adX/ILZM+555z768w9985MngcPHoao1fcpochwRTNC + PlWvBDYD21PYpGh6BfyroW9+oXEvDR+cKCw071S0yGifGtkGolwEmn0kjDHKgaMwFoUdBDDNO/zByBQQ + oD5FkHRYB5xIGQYu8kPhR2Civ9om3q/0q5HdQ4KxhyndwAJddV2pk7bxkF+LLIdb+k1fSH9+xPzqB4cF + /7gfif9XgsYLlk3VS32a3pYy1s5OyDWB0g4AwC0Lkw8wE0V2gxhl+aHIq31Zx9DXH9Rf82nGZisGG9v4 + GnPTkBwFTAAEKmEnGNR3FASij5HnbcOv7X2cunPvHJA7p0X0BSPfMBM7C1fO2+TSb4Arcpqi6ueYfBq5 + 5BaUoD6JmcwxXMvIpd/hD4ZfhBwnUnKacIW+RS65AbjyHoXCUxvG8fyA8SS5SINSFH4acp1MyX0qp7oz + bCd+S5nAeZ8WeYnM0uEPhF+BnBd61mD8QmZ3g7t1YW16n8wZA+SckVoHbG/GkNmdwO0FFNrQs/DITjJn + HJAfz9W2WvQ6Vx/74K+en1JwtxKIPEHmjMOnVj2FNdhrguXFR2b3AYrbYi8WBF1PpqwBtkw/2mvCjTuZ + 3IWR2t57oMAeC7cS0F8mc9ZADeV6TbBXVIr33U1m98AfMArshQKbyJRd4GlI1RP22oYGDYWs7gHcGqq9 + SGgey8iUdSiq8V3P2vQiMrkHeLa1F4lPX8iUdfhVY6q9NnyISyb3AAprtBc5NBR+lkxZR/JRmF1AvZ5M + 7gEU1eP49EYg+gCZsg58nmivDXiMTO4BFHXJXuSEwrq7yJR1YC322oAXyOQepBRo0s+ugdvr8wRMF24v + 0O31eQKmC7cX6Pb6PAH7gvxg5DnYzX8FheyBI1wt/HvUXlyO8CjVDnMw5srf+OP7XdWYDAl7nDgGFo04 + PlHv91eh+P4WEtSIRBOXVpuBHQmzorbDjBw8ax44csk82Hk1p4g1Y+0Vte3WXCZ8W31NSL8aieGLMZp+ + elBUfQQEPY2Bp5b8ZW6tOW4mOviicpk4J5wbzpGE7MLP6EiG2wOsDa9DIOuI9vmmRjN+optNPpAYP37Z + nFPWKES8iJ+dkBx9g/UllZZ8QFBc2WommGQDlXg1ahUHLRHhDjyhFEcfIlluEcmnuFEM8FlZfEDesjcj + znn2xri4EsN9aiyKZozHgZOW1liXNJdgMLD+2GWrYaIWt/5OOXn1We92N0SPsoEHE9frR8RVWEcK3Rj4 + cSMOmLLsT7Ol4wobdDARNZi8rIZEjD5DMjkDHIvQOVTRygaUzXDijJV7+vK/zbGLYxanl+6zGlkY9m3c + GNlUqaHg53okkzPA8Xd03rm/nQ0mi80nr5jBnQkzXzPELdOLaMPJNLdn9s7Ysa/dyo8fTZFMzgDHf9A5 + eugcG0wGUbyPf6hPihQyzNmbE+bq2GmzvP6SxdVVXfBbi1lA4n6yod4aw8WSQaP1LP0RjTjJ5AxwtE4d + mey+835usQocu6TGXFt92qxsvspyDYg6bnFyPcLjFxdLBlGLpIB6F8nkDHJkA8kgrnl+TTeHFUfNdTVn + WOHsRIELQlHrdo4kMrcmCl1IJmdkWkCxQH+xtZUVjOOcn5JjsLFwMWVQ6EIyOUM4ckFkcBp0W8yHax4n + FsfvYU3EMdiduZgyKHQhmZwhHLkgMjhyQZWVb3tjNysWx+3x5JqEY7mYMih0IZmcIRy5IDI4emFSwPKG + y6xYHLEz45gxi2JsTBkUupBMzhCOXBAZfHflfivfqugpViyOK4xT1pj3Vu1nY8qg0IVkcoZw5ILIIDYC + zDdrUwsrFseZ4Itj5u/ymohZBRt23MbgtmQlXFmcYHauMDotXxxT1XaejSmDrhUQuWj3ISvnqIUxSyBO + OGSp3glrZszyXbKnjY0li0IXkskZwpELIot4tp21scHKi8e1udvazMqm68JVNF0xvyxvu3aU+3RjPONP + ioQuJJMzhCMXRCZRELEe4vbEfuVVAIfPT3Zr9MnGYzahC8nkDOHIBZHNPQ2dVu5pKw70EBD5TmmtZUMf + bqxsCl1IJmcIRy6IbK7e+5+VG7tsqoAzy5Kdd034MDtWNoUuJJMzhCMXRDbxCQvmLtr1by8B58FvaMNn + htxY2RS6kEzOEI5cENn8YG2dlbsk3NFLwJJw8qHmjHV17FjZFLqQTM4QjlwQ2Ry3JPkGbEvthV4Cbobf + 0DYefLixsil0IZmcIRy5IDJZe/iilXfkglgv8QTRhj7oy8WQSaELyeQM4cgFkcnd9c4dWBBt6JONTix0 + IZmcIRy5IDJ5ow4smM1OLHQhmZwhHLkgMik6MHZbTjxkNjux0IVkcoZw5ILI5IfQXUXum/Gj9ZnvxCI3 + yeQM4cgFkUnRgW+F6MvFkEmRm2RyhnDkggxmegKmSU/ANOkJmCY9AdOkJ2Ca9ARMk56AabLPAnrkSTI5 + gxvk8TpJJg8ePHjwkJeX9z9IbqKdvJUGzgAAAABJRU5ErkJggg== + + + \ No newline at end of file diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 407f90d..ba38a2e 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -259,19 +259,25 @@ - - - - - - - - - - - - - + + Form + + + fLogin_WB.cs + + + + + + + + + + + + + + True @@ -392,9 +398,9 @@ - - - + + + @@ -463,6 +469,9 @@ fDebug.cs + + fLogin_WB.cs + fMsgWindow.cs @@ -624,10 +633,16 @@ PreserveNewest - + + PreserveNewest + + + PreserveNewest + + PreserveNewest - + PreserveNewest @@ -712,6 +727,9 @@ + + + diff --git a/Project/Manager/DataBaseManager.cs b/Project/Manager/DataBaseManager.cs index 931a791..d6cd165 100644 --- a/Project/Manager/DataBaseManager.cs +++ b/Project/Manager/DataBaseManager.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Project.Web.Model; +using System.Data; namespace Project.Manager { @@ -14,6 +16,38 @@ namespace Project.Manager cn.ConnectionString = cs; return cn; } + + /// + /// 입력된 id의 그룹정보를 반환 + /// + /// + /// + /// + public static GroupUserModel GetGroupUser(string gcode, string uid) + { + var retval = new GroupUserModel(); + var cn = getCn(); + + var sql = "select * from EETGW_GroupUser where gcode = @gcode and uid = @uid"; + var cmd = new System.Data.SqlClient.SqlCommand(sql,cn); + cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode; + cmd.Parameters.Add("uid", SqlDbType.VarChar).Value = uid; + cn.Open(); + var rdr = cmd.ExecuteReader(); + var cnt = 0; + foreach(var dr in rdr) + { + cnt += 1; + } + + retval.Gcode = gcode; + retval.uid = uid; + + cn.Dispose(); + return retval; + } + + public static List getGroupList(string GroupColumn, string table, string where = "") { List retval = new List(); diff --git a/Project/OWIN/Startup.cs b/Project/OWIN/Startup.cs deleted file mode 100644 index a1b80f1..0000000 --- a/Project/OWIN/Startup.cs +++ /dev/null @@ -1,79 +0,0 @@ -using Microsoft.Owin; -using Owin; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Web.Http; -using System.Web.Http.Routing; - -namespace Project.OWIN -{ - public class Startup - { - public void Configuration(IAppBuilder app) - { - // Configure Web API for Self-Host - HttpConfiguration config = new HttpConfiguration(); - config.MapHttpAttributeRoutes(); - - //메인파일 처리 방법 - IHttpRoute defaultRoute = - config.Routes.CreateRoute("{controller}/{action}/{id}", - new { controller = "home", action = "index", id = RouteParameter.Optional }, - null); - - //기타파일들 처리 방법 - IHttpRoute cssRoute = - config.Routes.CreateRoute("{path}/{subdir}/{resource}.{ext}", - new { controller = "resource", action = "file", id = RouteParameter.Optional }, - null); - - IHttpRoute mifRoute = - config.Routes.CreateRoute("{path}/{resource}.{ext}", - new { controller = "resource", action = "file", id = RouteParameter.Optional }, - null); - - IHttpRoute icoRoute = - config.Routes.CreateRoute("{resource}.{ext}", - new { controller = "resource", action = "file", id = RouteParameter.Optional }, - null); - - config.Routes.Add("mifRoute", mifRoute); - config.Routes.Add("icoRoute", icoRoute); - config.Routes.Add("cssRoute", cssRoute); - config.Routes.Add("defaultRoute", defaultRoute); - - app.UseStaticFiles(); - app.UseCors(Microsoft.Owin.Cors.CorsOptions.AllowAll); - app.UseWebApi(config); - - - //appBuilder.UseFileServer(new FileServerOptions - //{ - // RequestPath = new PathString(string.Empty), - // FileSystem = new PhysicalFileSystem("./MySubFolder"), - // EnableDirectoryBrowsing = true, - //}); - - //appBuilder.UseStageMarker(PipelineStage.MapHandler); - - - //config.Routes.MapHttpRoute( - // name: "ignore", - // routeTemplate: @".*\.(css|js|gif|jpg)(/.*)?", - // defaults: new - // { - // controller = "file", - // action = "readtext", - // id = RouteParameter.Optional - // } - // ); - - - - } - - } -} diff --git a/Project/View/intro.html b/Project/View/intro.html deleted file mode 100644 index a5ffa4c..0000000 --- a/Project/View/intro.html +++ /dev/null @@ -1 +0,0 @@ -intro file \ No newline at end of file diff --git a/Project/Controller/APIController.cs b/Project/Web/Controller/APIController.cs similarity index 96% rename from Project/Controller/APIController.cs rename to Project/Web/Controller/APIController.cs index 0461eca..cfeeff7 100644 --- a/Project/Controller/APIController.cs +++ b/Project/Web/Controller/APIController.cs @@ -1,148 +1,148 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; -using Newtonsoft.Json; - -namespace Project -{ - public class APIController : BaseController - { - [HttpGet] - public HttpResponseMessage Getdata() - { - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - var sql = string.Empty; - var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault(); - if (p_sql.Key.isEmpty() == false) sql = p_sql.Value; - else - { - var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault(); - var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault(); - var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault(); - var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault(); - sql = "select * from {0} where gcode = '{gcode}'"; - sql = string.Format(sql, p_table.Value, p_gcode.Value); - if (p_where.Key != null) sql += " and " + p_where.Value; - if (p_order.Key != null) sql += " order by " + p_order.Value; - } - - - if (FCOMMON.info.Login.gcode == null) - FCOMMON.info.Login.gcode = "EET1P"; - sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); - - var cs = Properties.Settings.Default.gwcs; // "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!"; - var cn = new System.Data.SqlClient.SqlConnection(cs); - var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); - var da = new System.Data.SqlClient.SqlDataAdapter(cmd); - var dt = new System.Data.DataTable(); - da.Fill(dt); - da.Dispose(); - cmd.Dispose(); - cn.Dispose(); - - var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings - { - NullValueHandling = NullValueHandling.Ignore - }); - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - txtjson, - System.Text.Encoding.UTF8, - "application/json") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Gettable() - { - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - var sql = string.Empty; - var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault(); - if (p_sql.Key.isEmpty() == false) sql = p_sql.Value; - else - { - var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault(); - var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault(); - var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault(); - var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault(); - sql = "select * from {0} where gcode = '{gcode}'"; - sql = string.Format(sql, p_table.Value, p_gcode.Value); - if (p_where.Key != null) sql += " and " + p_where.Value; - if (p_order.Key != null) sql += " order by " + p_order.Value; - } - - - if (FCOMMON.info.Login.gcode == null) - FCOMMON.info.Login.gcode = "EET1P"; - sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); - - var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!"; - var cn = new System.Data.SqlClient.SqlConnection(cs); - var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); - var da = new System.Data.SqlClient.SqlDataAdapter(cmd); - var dt = new System.Data.DataTable(); - da.Fill(dt); - da.Dispose(); - cmd.Dispose(); - cn.Dispose(); - - var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings - { - NullValueHandling = NullValueHandling.Ignore - }); - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - txtjson, - System.Text.Encoding.UTF8, - "application/json") - }; - - return resp; - - - } - - - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; +using Newtonsoft.Json; + +namespace Project.Web.Controllers +{ + public class APIController : BaseController + { + [HttpGet] + public HttpResponseMessage Getdata() + { + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + var sql = string.Empty; + var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault(); + if (p_sql.Key.isEmpty() == false) sql = p_sql.Value; + else + { + var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault(); + var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault(); + var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault(); + var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault(); + sql = "select * from {0} where gcode = '{gcode}'"; + sql = string.Format(sql, p_table.Value, p_gcode.Value); + if (p_where.Key != null) sql += " and " + p_where.Value; + if (p_order.Key != null) sql += " order by " + p_order.Value; + } + + + if (FCOMMON.info.Login.gcode == null) + FCOMMON.info.Login.gcode = "EET1P"; + sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); + + var cs = Properties.Settings.Default.gwcs; // "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!"; + var cn = new System.Data.SqlClient.SqlConnection(cs); + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + var da = new System.Data.SqlClient.SqlDataAdapter(cmd); + var dt = new System.Data.DataTable(); + da.Fill(dt); + da.Dispose(); + cmd.Dispose(); + cn.Dispose(); + + var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + txtjson, + System.Text.Encoding.UTF8, + "application/json") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Gettable() + { + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + var sql = string.Empty; + var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault(); + if (p_sql.Key.isEmpty() == false) sql = p_sql.Value; + else + { + var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault(); + var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault(); + var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault(); + var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault(); + sql = "select * from {0} where gcode = '{gcode}'"; + sql = string.Format(sql, p_table.Value, p_gcode.Value); + if (p_where.Key != null) sql += " and " + p_where.Value; + if (p_order.Key != null) sql += " order by " + p_order.Value; + } + + + if (FCOMMON.info.Login.gcode == null) + FCOMMON.info.Login.gcode = "EET1P"; + sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); + + var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!"; + var cn = new System.Data.SqlClient.SqlConnection(cs); + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + var da = new System.Data.SqlClient.SqlDataAdapter(cmd); + var dt = new System.Data.DataTable(); + da.Fill(dt); + da.Dispose(); + cmd.Dispose(); + cn.Dispose(); + + var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + txtjson, + System.Text.Encoding.UTF8, + "application/json") + }; + + return resp; + + + } + + + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var contents = result.Content; + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/BaseController.cs b/Project/Web/Controller/BaseController.cs similarity index 97% rename from Project/BaseController.cs rename to Project/Web/Controller/BaseController.cs index 4cf2c56..4709f07 100644 --- a/Project/BaseController.cs +++ b/Project/Web/Controller/BaseController.cs @@ -1,318 +1,318 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Web.Http; -using agi = HtmlAgilityPack; - - -namespace Project -{ - public struct MethodResult : IEquatable - { - public string Content; - public byte[] Contentb; - public string Redirecturl; - - public override bool Equals(object obj) - { - if (!(obj is MethodResult)) - return false; - - return Equals((MethodResult)obj); - } - - public override int GetHashCode() - { - if (Contentb == null) - return Content.GetHashCode() ^ Redirecturl.GetHashCode(); - else - return Content.GetHashCode() ^ Redirecturl.GetHashCode() ^ Contentb.GetHexString().GetHashCode(); - - } - - public bool Equals(MethodResult other) - { - if (Content != other.Content) - return false; - - if (Redirecturl != other.Redirecturl) - return false; - - return Contentb == other.Contentb; - } - - - public static bool operator ==(MethodResult point1, MethodResult point2) - { - return point1.Equals(point2); - } - - public static bool operator !=(MethodResult point1, MethodResult point2) - { - return !point1.Equals(point2); - } - } - - sealed class PostRequest : Attribute - { - - } - - public class BaseController : ApiController - { - public string QueryString { get; set; } - public string PostData { get; set; } - public string ParamData { get; set; } - - protected string Trig_Ctrl { get; set; } - protected string Trig_func { get; set; } - - public PageModel GetGlobalModel() - { - var config = RequestContext.Configuration; - var routeData = config.Routes.GetRouteData(Request).Values.ToList(); - var name_ctrl = routeData[0].Value.ToString(); - var name_action = routeData[1].Value.ToString(); - - - return new PageModel - { - RouteData = routeData, - urlcontrol = name_ctrl, - urlaction = name_action - }; - } - - - public MethodResult View(bool nosubdir=false) - { - var config = RequestContext.Configuration; - if (config != null) - { - var routeData = config.Routes.GetRouteData(Request).Values.ToList(); - var name_ctrl = routeData[0].Value.ToString(); - if (nosubdir) name_ctrl = string.Empty; - var name_action = routeData[1].Value.ToString(); - return View(name_ctrl, name_action); - } - else - { - return View(Trig_Ctrl + "/" + Trig_func); - } - - } - - - public static void ApplyCommonValue(ref string contents) - { - //메뉴 푸터 - 개발자 정보 - if (contents.Contains("{title}")) - contents = contents.Replace("{title}", FCOMMON.info.Login.gcode + " Groupware"); - - } - - public MethodResult View(string Controller, string Action, Boolean applydefaultview = true) - { - var retval = new MethodResult(); - - if (Action.IndexOf(".") == -1) - Action += ".html"; //기본값 html 을 넣는다 - - var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", Controller, Action); - - var contents = string.Empty; - - if (System.IO.File.Exists(file) == false) - { - //error 폴더의 404.html 파일을 찾는다. - var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html"); - if (System.IO.File.Exists(file404)) - { - contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8); - contents = contents.Replace("{errorfilename}", file); - } - - else - contents = "ERROR CODE - 404 (NOT FOUND)
" + file; - - Console.WriteLine("view File not found : " + file); - } - else - { - //디폴트뷰의 내용을 가져온다 (있다면 적용한다) - if (applydefaultview) - { - //뷰파일이 있다면 그것을 적용한다 - var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html"); - if (System.IO.File.Exists(laytoutfile)) - contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8); - - var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); - if (String.IsNullOrEmpty(contents)) contents = fileContents; - else contents = contents.Replace("{contents}", fileContents); - } - else - { - //해당 뷰를 가져와서 반환한다 - contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); - } - } - - agi.HtmlDocument doc = new agi.HtmlDocument(); - doc.LoadHtml(contents); - - //파일참조 태그를 모두 가져옴 - var tags_include = doc.QuerySelectorAll("include"); - foreach (var item in tags_include) - { - var filename = item.InnerText; - - var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\")); - load_file = load_file.Replace("\\\\", "\\"); - String fileContents;// = String.Empty; - - Console.WriteLine("## " + item.OuterHtml); - if (System.IO.File.Exists(load_file)) - { - fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8); - } - else - { - fileContents = string.Format("
#include Error:nofile:{0}
", - filename); //파일이없다면 해당 부분은 오류 처리한다. - } - contents = contents.Replace(item.OuterHtml, fileContents); - } - - //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다 - - - //시스템변수 replace - contents = contents.Replace("{param_control}", Trig_Ctrl); - contents = contents.Replace("{param_function}", Trig_func); - - retval.Content = contents; - return retval; - } - public MethodResult View(string viewfilename, Boolean applydefaultview = true) - { - var retval = new MethodResult(); - - if (viewfilename.IndexOf(".") == -1) - viewfilename += ".html"; //기본값 html 을 넣는다 - - var file = AppDomain.CurrentDomain.BaseDirectory + "View" + viewfilename.Replace("/", "\\"); - - var contents = string.Empty; - - if (System.IO.File.Exists(file) == false) - { - //error 폴더의 404.html 파일을 찾는다. - var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html"); - if (System.IO.File.Exists(file404)) - { - contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8); - contents = contents.Replace("{errorfilename}", file); - } - - else - contents = "ERROR CODE - 404 (NOT FOUND)
" + file; - - Console.WriteLine("view File not found : " + file); - } - else - { - //디폴트뷰의 내용을 가져온다 (있다면 적용한다) - if (applydefaultview) - { - //뷰파일이 있다면 그것을 적용한다 - var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html"); - if (System.IO.File.Exists(laytoutfile)) - contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8); - - var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); - if (String.IsNullOrEmpty(contents)) contents = fileContents; - else contents = contents.Replace("{contents}", fileContents); - } - else - { - //해당 뷰를 가져와서 반환한다 - contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); - } - } - - agi.HtmlDocument doc = new agi.HtmlDocument(); - doc.LoadHtml(contents); - - //파일참조 태그를 모두 가져옴 - var tags_include = doc.QuerySelectorAll("include"); - foreach (var item in tags_include) - { - var filename = item.InnerText; - - var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\")); - load_file = load_file.Replace("\\\\", "\\"); - String fileContents;// = String.Empty; - - Console.WriteLine("## " + item.OuterHtml); - if (System.IO.File.Exists(load_file)) - { - fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8); - } - else - { - fileContents = string.Format("
#include Error:nofile:{0}
", - filename); //파일이없다면 해당 부분은 오류 처리한다. - } - contents = contents.Replace(item.OuterHtml, fileContents); - } - - - - //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다 - while (true) - { - var fileindexS = contents.IndexOf("{file:"); - if (fileindexS == -1) break; - var fileindexE = contents.IndexOf("}", fileindexS); - if (fileindexE == -1) break; - if (fileindexE <= fileindexS + 5) break; - var inlinestr = contents.Substring(fileindexS, fileindexE - fileindexS + 1); - var filename = contents.Substring(fileindexS + 7, fileindexE - fileindexS - 8); - var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", "\\", filename.Replace("/", "\\")); - load_file = load_file.Replace("\\\\", "\\"); - String fileContents;// = String.Empty; - - Console.WriteLine("file impot : " + load_file); - if (System.IO.File.Exists(load_file)) - { - fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8); - } - else - { - fileContents = "{FileNotFound:" + filename + "}"; //파일이없다면 해당 부분은 오류 처리한다. - } - contents = contents.Replace(inlinestr, fileContents); - } - - //시스템변수 replace - contents = contents.Replace("{param_control}", Trig_Ctrl); - contents = contents.Replace("{param_function}", Trig_func); - - retval.Content = contents; - return retval; - } - protected class Parameter - { - public string Key { get; set; } - public string Value { get; set; } - public Parameter(string key_, string value_) - { - Key = key_; - Value = value_; - } - } - - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Web.Http; +using agi = HtmlAgilityPack; + + +namespace Project.Web.Controllers +{ + public struct MethodResult : IEquatable + { + public string Content; + public byte[] Contentb; + public string Redirecturl; + + public override bool Equals(object obj) + { + if (!(obj is MethodResult)) + return false; + + return Equals((MethodResult)obj); + } + + public override int GetHashCode() + { + if (Contentb == null) + return Content.GetHashCode() ^ Redirecturl.GetHashCode(); + else + return Content.GetHashCode() ^ Redirecturl.GetHashCode() ^ Contentb.GetHexString().GetHashCode(); + + } + + public bool Equals(MethodResult other) + { + if (Content != other.Content) + return false; + + if (Redirecturl != other.Redirecturl) + return false; + + return Contentb == other.Contentb; + } + + + public static bool operator ==(MethodResult point1, MethodResult point2) + { + return point1.Equals(point2); + } + + public static bool operator !=(MethodResult point1, MethodResult point2) + { + return !point1.Equals(point2); + } + } + + sealed class PostRequest : Attribute + { + + } + + public class BaseController : ApiController + { + public string QueryString { get; set; } + public string PostData { get; set; } + public string ParamData { get; set; } + + protected string Trig_Ctrl { get; set; } + protected string Trig_func { get; set; } + + public PageModel GetGlobalModel() + { + var config = RequestContext.Configuration; + var routeData = config.Routes.GetRouteData(Request).Values.ToList(); + var name_ctrl = routeData[0].Value.ToString(); + var name_action = routeData[1].Value.ToString(); + + + return new PageModel + { + RouteData = routeData, + urlcontrol = name_ctrl, + urlaction = name_action + }; + } + + + public MethodResult View(bool nosubdir=false) + { + var config = RequestContext.Configuration; + if (config != null) + { + var routeData = config.Routes.GetRouteData(Request).Values.ToList(); + var name_ctrl = routeData[0].Value.ToString(); + if (nosubdir) name_ctrl = string.Empty; + var name_action = routeData[1].Value.ToString(); + return View(name_ctrl, name_action); + } + else + { + return View(Trig_Ctrl + "/" + Trig_func); + } + + } + + + public static void ApplyCommonValue(ref string contents) + { + //메뉴 푸터 - 개발자 정보 + if (contents.Contains("{title}")) + contents = contents.Replace("{title}", FCOMMON.info.Login.gcode + " Groupware"); + + } + + public MethodResult View(string Controller, string Action, Boolean applydefaultview = true) + { + var retval = new MethodResult(); + + if (Action.IndexOf(".") == -1) + Action += ".html"; //기본값 html 을 넣는다 + + var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", Controller, Action); + + var contents = string.Empty; + + if (System.IO.File.Exists(file) == false) + { + //error 폴더의 404.html 파일을 찾는다. + var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html"); + if (System.IO.File.Exists(file404)) + { + contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8); + contents = contents.Replace("{errorfilename}", file); + } + + else + contents = "ERROR CODE - 404 (NOT FOUND)
" + file; + + Console.WriteLine("view File not found : " + file); + } + else + { + //디폴트뷰의 내용을 가져온다 (있다면 적용한다) + if (applydefaultview) + { + //뷰파일이 있다면 그것을 적용한다 + var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html"); + if (System.IO.File.Exists(laytoutfile)) + contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8); + + var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); + if (String.IsNullOrEmpty(contents)) contents = fileContents; + else contents = contents.Replace("{contents}", fileContents); + } + else + { + //해당 뷰를 가져와서 반환한다 + contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); + } + } + + agi.HtmlDocument doc = new agi.HtmlDocument(); + doc.LoadHtml(contents); + + //파일참조 태그를 모두 가져옴 + var tags_include = doc.QuerySelectorAll("include"); + foreach (var item in tags_include) + { + var filename = item.InnerText; + + var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\")); + load_file = load_file.Replace("\\\\", "\\"); + String fileContents;// = String.Empty; + + Console.WriteLine("## " + item.OuterHtml); + if (System.IO.File.Exists(load_file)) + { + fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8); + } + else + { + fileContents = string.Format("
#include Error:nofile:{0}
", + filename); //파일이없다면 해당 부분은 오류 처리한다. + } + contents = contents.Replace(item.OuterHtml, fileContents); + } + + //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다 + + + //시스템변수 replace + contents = contents.Replace("{param_control}", Trig_Ctrl); + contents = contents.Replace("{param_function}", Trig_func); + + retval.Content = contents; + return retval; + } + public MethodResult View(string viewfilename, Boolean applydefaultview = true) + { + var retval = new MethodResult(); + + if (viewfilename.IndexOf(".") == -1) + viewfilename += ".html"; //기본값 html 을 넣는다 + + var file = AppDomain.CurrentDomain.BaseDirectory + "View" + viewfilename.Replace("/", "\\"); + + var contents = string.Empty; + + if (System.IO.File.Exists(file) == false) + { + //error 폴더의 404.html 파일을 찾는다. + var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html"); + if (System.IO.File.Exists(file404)) + { + contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8); + contents = contents.Replace("{errorfilename}", file); + } + + else + contents = "ERROR CODE - 404 (NOT FOUND)
" + file; + + Console.WriteLine("view File not found : " + file); + } + else + { + //디폴트뷰의 내용을 가져온다 (있다면 적용한다) + if (applydefaultview) + { + //뷰파일이 있다면 그것을 적용한다 + var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html"); + if (System.IO.File.Exists(laytoutfile)) + contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8); + + var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); + if (String.IsNullOrEmpty(contents)) contents = fileContents; + else contents = contents.Replace("{contents}", fileContents); + } + else + { + //해당 뷰를 가져와서 반환한다 + contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); + } + } + + agi.HtmlDocument doc = new agi.HtmlDocument(); + doc.LoadHtml(contents); + + //파일참조 태그를 모두 가져옴 + var tags_include = doc.QuerySelectorAll("include"); + foreach (var item in tags_include) + { + var filename = item.InnerText; + + var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\")); + load_file = load_file.Replace("\\\\", "\\"); + String fileContents;// = String.Empty; + + Console.WriteLine("## " + item.OuterHtml); + if (System.IO.File.Exists(load_file)) + { + fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8); + } + else + { + fileContents = string.Format("
#include Error:nofile:{0}
", + filename); //파일이없다면 해당 부분은 오류 처리한다. + } + contents = contents.Replace(item.OuterHtml, fileContents); + } + + + + //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다 + while (true) + { + var fileindexS = contents.IndexOf("{file:"); + if (fileindexS == -1) break; + var fileindexE = contents.IndexOf("}", fileindexS); + if (fileindexE == -1) break; + if (fileindexE <= fileindexS + 5) break; + var inlinestr = contents.Substring(fileindexS, fileindexE - fileindexS + 1); + var filename = contents.Substring(fileindexS + 7, fileindexE - fileindexS - 8); + var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", "\\", filename.Replace("/", "\\")); + load_file = load_file.Replace("\\\\", "\\"); + String fileContents;// = String.Empty; + + Console.WriteLine("file impot : " + load_file); + if (System.IO.File.Exists(load_file)) + { + fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8); + } + else + { + fileContents = "{FileNotFound:" + filename + "}"; //파일이없다면 해당 부분은 오류 처리한다. + } + contents = contents.Replace(inlinestr, fileContents); + } + + //시스템변수 replace + contents = contents.Replace("{param_control}", Trig_Ctrl); + contents = contents.Replace("{param_function}", Trig_func); + + retval.Content = contents; + return retval; + } + protected class Parameter + { + public string Key { get; set; } + public string Value { get; set; } + public Parameter(string key_, string value_) + { + Key = key_; + Value = value_; + } + } + + } +} diff --git a/Project/Controller/CustomerController.cs b/Project/Web/Controller/CustomerController.cs similarity index 96% rename from Project/Controller/CustomerController.cs rename to Project/Web/Controller/CustomerController.cs index 957ae68..bb1bc79 100644 --- a/Project/Controller/CustomerController.cs +++ b/Project/Web/Controller/CustomerController.cs @@ -1,198 +1,198 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class CustomerController : BaseController - { - - // PUT api/values/5 - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - [HttpGet] - public HttpResponseMessage Find() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - if (searchkey.isEmpty() == false) - { - var db = new dsMSSQLTableAdapters.CustomsTableAdapter();//.custrom EEEntitiesCommon(); - var rows = db.GetData(FCOMMON.info.Login.gcode);// db.Customs.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.name2}"); - tbody.AppendLine($"{item.name}"); - //tbody.AppendLine($"{item.model}"); - - //if (item.price == null) - // tbody.AppendLine($"--"); - //else - //{ - // var price = (double)item.price / 1000.0; - - // tbody.AppendLine($"{price.ToString("N0")}"); - //} - - - //tbody.AppendLine($"{item.manu}"); - //tbody.AppendLine($"{item.supply}"); - - //if (item.remark.Length > 10) - // tbody.AppendLine($"{item.remark.Substring(0, 10)}..."); - //else - // tbody.AppendLine($"{item.remark}"); - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - //if (searchkey.isEmpty() == false) - { - var db = new dsMSSQLTableAdapters.CustomsTableAdapter();// EEEntitiesCommon(); - var sd = DateTime.Now.ToString("yyyy-MM-01"); - var rows = db.GetData(FCOMMON.info.Login.gcode);// .Customs.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t=>t.name); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.grp}"); - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.name2}"); - tbody.AppendLine($"{item.tel}"); - tbody.AppendLine($"{item.fax}"); - tbody.AppendLine($"{item.email}"); - tbody.AppendLine($"{item.address}"); - - - - if (string.IsNullOrEmpty( item.memo)==false && item.memo.Length > 10) tbody.AppendLine($"{item.memo.Substring(0, 10)}..."); - else tbody.AppendLine($"{item.memo}"); - - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class CustomerController : BaseController + { + + // PUT api/values/5 + public void Put(int id, [FromBody] string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string Test() + { + return "test"; + } + + [HttpGet] + public HttpResponseMessage Find() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + if (searchkey.isEmpty() == false) + { + var db = new dsMSSQLTableAdapters.CustomsTableAdapter();//.custrom EEEntitiesCommon(); + var rows = db.GetData(FCOMMON.info.Login.gcode);// db.Customs.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.name2}"); + tbody.AppendLine($"{item.name}"); + //tbody.AppendLine($"{item.model}"); + + //if (item.price == null) + // tbody.AppendLine($"--"); + //else + //{ + // var price = (double)item.price / 1000.0; + + // tbody.AppendLine($"{price.ToString("N0")}"); + //} + + + //tbody.AppendLine($"{item.manu}"); + //tbody.AppendLine($"{item.supply}"); + + //if (item.remark.Length > 10) + // tbody.AppendLine($"{item.remark.Substring(0, 10)}..."); + //else + // tbody.AppendLine($"{item.remark}"); + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + { + var db = new dsMSSQLTableAdapters.CustomsTableAdapter();// EEEntitiesCommon(); + var sd = DateTime.Now.ToString("yyyy-MM-01"); + var rows = db.GetData(FCOMMON.info.Login.gcode);// .Customs.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t=>t.name); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.grp}"); + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.name2}"); + tbody.AppendLine($"{item.tel}"); + tbody.AppendLine($"{item.fax}"); + tbody.AppendLine($"{item.email}"); + tbody.AppendLine($"{item.address}"); + + + + if (string.IsNullOrEmpty( item.memo)==false && item.memo.Length > 10) tbody.AppendLine($"{item.memo.Substring(0, 10)}..."); + else tbody.AppendLine($"{item.memo}"); + + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/DashBoardController.cs b/Project/Web/Controller/DashBoardController.cs similarity index 79% rename from Project/Controller/DashBoardController.cs rename to Project/Web/Controller/DashBoardController.cs index 8a36c3f..4345a30 100644 --- a/Project/Controller/DashBoardController.cs +++ b/Project/Web/Controller/DashBoardController.cs @@ -1,115 +1,116 @@ -using FCOMMON; -using Newtonsoft.Json; -using System; -using System.Linq; -using System.Net.Http; -using System.Security.Cryptography; -using System.Web.Http; - -namespace Project -{ - public class DashBoardController : BaseController - { - [HttpPost] - public void Index([FromBody] string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string TodayCountH() - { - - var sql = "select count(*) from EETGW_HolydayRequest " + - "where gcode = 'EET1P' and conf = 1 and HolyDays > 0 and " + - "sdate <= GETDATE() and edate >= GETDATE()"; - var cnt = DBM.ExecuteScalar(sql); - return cnt.ToString(); - - } - - - [HttpGet] - public HttpResponseMessage GetholyUser() - { - var sql = string.Empty; - sql = $"select uid,cate,sdate,edate,HolyReason " + - $"from EETGW_HolydayRequest " + - $"where gcode = '{FCOMMON.info.Login.gcode}'" + - $"and conf = 1 and HolyDays > 0 and sdate <= GETDATE() and edate >= GETDATE()"; - - if (info.Login.gcode == null) - info.Login.gcode = "EET1P"; - - sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); - - var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!"; - var cn = new System.Data.SqlClient.SqlConnection(cs); - var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); - var da = new System.Data.SqlClient.SqlDataAdapter(cmd); - var dt = new System.Data.DataTable(); - da.Fill(dt); - da.Dispose(); - cmd.Dispose(); - cn.Dispose(); - - var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings - { - NullValueHandling = NullValueHandling.Ignore - }); - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - txtjson, - System.Text.Encoding.UTF8, - "application/json") - }; - - return resp; - - - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using FCOMMON; +using Newtonsoft.Json; +using System; +using System.Linq; +using System.Net.Http; +using System.Security.Cryptography; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class DashBoardController : BaseController + { + [HttpPost] + public void Index([FromBody] string value) + { + + } + + // PUT api/values/5 + public void Put(int id, [FromBody] string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string TodayCountH() + { + + var sql = "select count(*) from EETGW_HolydayRequest " + + "where gcode = 'EET1P' and conf = 1 and HolyDays > 0 and " + + "sdate <= GETDATE() and edate >= GETDATE()"; + var cnt = DBM.ExecuteScalar(sql); + return cnt.ToString(); + + } + + + [HttpGet] + public HttpResponseMessage GetholyUser() + { + var sql = string.Empty; + sql = $"select uid,cate,sdate,edate,HolyReason " + + $"from EETGW_HolydayRequest " + + $"where gcode = '{FCOMMON.info.Login.gcode}'" + + $"and conf = 1 and HolyDays > 0 and sdate <= GETDATE() and edate >= GETDATE()"; + + if (info.Login.gcode == null) + info.Login.gcode = "EET1P"; + + sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode); + + var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!"; + var cn = new System.Data.SqlClient.SqlConnection(cs); + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + var da = new System.Data.SqlClient.SqlDataAdapter(cmd); + var dt = new System.Data.DataTable(); + da.Fill(dt); + da.Dispose(); + cmd.Dispose(); + cn.Dispose(); + + var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + txtjson, + System.Text.Encoding.UTF8, + "application/json") + }; + + return resp; + + + } + + [HttpGet] + public HttpResponseMessage Index() + { + // 직접 파일을 읽어서 반환 + var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "DashBoard", "index.html"); + var contents = string.Empty; + + if (System.IO.File.Exists(filePath)) + { + contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8); + } + else + { + // 파일이 없으면 404 에러 페이지 또는 기본 메시지 + contents = "

404 - File Not Found

The requested file was not found: " + filePath + "

"; + } + + //공용값 적용 + ApplyCommonValue(ref contents); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + contents, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Web/Controller/HomeController.cs b/Project/Web/Controller/HomeController.cs new file mode 100644 index 0000000..1fde961 --- /dev/null +++ b/Project/Web/Controller/HomeController.cs @@ -0,0 +1,299 @@ +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; +using Newtonsoft.Json; +using System.Collections.Generic; + +namespace Project.Web.Controllers +{ + // 로그인 요청 모델 + public class LoginRequest + { + public string UserId { get; set; } + public string Password { get; set; } + public bool RememberMe { get; set; } + } + + // 로그인 응답 모델 + public class LoginResponse + { + public bool Success { get; set; } + public string Message { get; set; } + public string RedirectUrl { get; set; } + public object UserData { get; set; } + } + + public class HomeController : BaseController + { + [HttpPost] + public void Index([FromBody]string value) + { + + } + + // PUT api/values/5 + public void Put(int id, [FromBody]string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string Test() + { + return "test"; + } + + [HttpPost] + public HttpResponseMessage Login([FromBody] LoginRequest request) + { + var response = new LoginResponse(); + + try + { + // 입력값 검증 + if (string.IsNullOrEmpty(request?.UserId) || string.IsNullOrEmpty(request?.Password)) + { + response.Success = false; + response.Message = "사용자 ID와 비밀번호를 입력해주세요."; + return CreateJsonResponse(response); + } + + // TODO: 여기에 실제 데이터베이스 로그인 로직을 구현하세요 + // 예시: 데이터베이스에서 사용자 정보 확인 + bool isValidUser = ValidateUser(request.UserId, request.Password); + + if (isValidUser) + { + // 로그인 성공 + response.Success = true; + response.Message = "로그인에 성공했습니다."; + response.RedirectUrl = "/DashBoard"; + + // 사용자 정보 설정 (세션 또는 쿠키) + SetUserSession(request.UserId, request.RememberMe); + + // 사용자 데이터 반환 + response.UserData = new + { + UserId = request.UserId, + LoginTime = DateTime.Now, + RememberMe = request.RememberMe + }; + } + else + { + // 로그인 실패 + response.Success = false; + response.Message = "사용자 ID 또는 비밀번호가 올바르지 않습니다."; + } + } + catch (Exception ex) + { + response.Success = false; + response.Message = "로그인 처리 중 오류가 발생했습니다: " + ex.Message; + } + + return CreateJsonResponse(response); + } + + [HttpPost] + public HttpResponseMessage Logout() + { + var response = new LoginResponse(); + + try + { + // TODO: 여기에 로그아웃 로직을 구현하세요 + // 예시: 세션 정리, 쿠키 삭제 등 + ClearUserSession(); + + response.Success = true; + response.Message = "로그아웃되었습니다."; + response.RedirectUrl = "/Login"; + } + catch (Exception ex) + { + response.Success = false; + response.Message = "로그아웃 처리 중 오류가 발생했습니다: " + ex.Message; + } + + return CreateJsonResponse(response); + } + + [HttpGet] + public HttpResponseMessage CheckLoginStatus() + { + var response = new LoginResponse(); + + try + { + // TODO: 여기에 로그인 상태 확인 로직을 구현하세요 + // 예시: 세션 또는 쿠키에서 사용자 정보 확인 + var currentUser = GetCurrentUser(); + + if (currentUser != null) + { + response.Success = true; + response.Message = "로그인된 상태입니다."; + response.UserData = currentUser; + } + else + { + response.Success = false; + response.Message = "로그인되지 않은 상태입니다."; + response.RedirectUrl = "/Login"; + } + } + catch (Exception ex) + { + response.Success = false; + response.Message = "로그인 상태 확인 중 오류가 발생했습니다: " + ex.Message; + } + + return CreateJsonResponse(response); + } + + // 헬퍼 메서드들 + private bool ValidateUser(string userId, string password) + { + // TODO: 실제 데이터베이스 검증 로직을 여기에 구현하세요 + // 예시: 데이터베이스에서 사용자 정보 조회 및 비밀번호 검증 + var encpass = Pub.MakePasswordEnc(password.Trim()); + + + // 임시 테스트용 (실제로는 데이터베이스에서 확인) + return userId == "admin" && password == "admin"; + } + + private void SetUserSession(string userId, bool rememberMe) + { + // TODO: 세션 또는 쿠키에 사용자 정보 저장 + // 예시: HttpContext.Session["UserId"] = userId; + // 예시: 쿠키 설정 (rememberMe가 true인 경우) + //데이터베이스에서 해당 정보를 찾아와서 처리해야한다 + + FCOMMON.info.Login.no = userId; + FCOMMON.info.Login.nameK = drUser.name; + FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text; + FCOMMON.info.Login.level = drGrpUser.level; + FCOMMON.info.Login.email = drUser.email; + FCOMMON.info.Login.nameE = drUser.nameE; + FCOMMON.info.Login.hp = drUser.hp; + FCOMMON.info.Login.tel = drUser.tel; + FCOMMON.info.Login.title = drUser.dept + "(" + drUser.grade + ")"; + FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; + //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); + FCOMMON.info.Login.gcode = gCode;// gcode; + FCOMMON.info.Login.process = drUser.id == "dev" ? "개발자" : drGrpUser.Process; + FCOMMON.info.Login.permission = 0; + FCOMMON.info.Login.gpermission = int.Parse(gperm); + //FCOMMON.info.datapath = Pub.setting.SharedDataPath; + FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625 + + + } + + private void ClearUserSession() + { + // TODO: 세션 또는 쿠키에서 사용자 정보 삭제 + FCOMMON.info.Login.no = string.Empty; + FCOMMON.info.Login.level = 0; + FCOMMON.info.Login.gcode = string.Empty; + FCOMMON.info.Login.permission = 0; + FCOMMON.info.Login.gpermission = 0; + Console.WriteLine("logout"); + } + + private object GetCurrentUser() + { + // TODO: 현재 로그인된 사용자 정보 반환 + // 예시: HttpContext.Session["UserId"]에서 사용자 정보 조회 + return null; // 임시로 null 반환 + } + + 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") + }; + } + + [HttpGet] + public HttpResponseMessage Login() + { + // 직접 파일을 읽어서 반환 + var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "login.html"); + var contents = string.Empty; + + if (System.IO.File.Exists(filePath)) + { + contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8); + } + else + { + // 파일이 없으면 404 에러 페이지 또는 기본 메시지 + contents = "

404 - File Not Found

The requested file was not found: " + filePath + "

"; + } + + //공용값 적용 + ApplyCommonValue(ref contents); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + contents, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Index() + { + // 직접 파일을 읽어서 반환 + var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "index.html"); + var contents = string.Empty; + + if (System.IO.File.Exists(filePath)) + { + contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8); + } + else + { + // 파일이 없으면 404 에러 페이지 또는 기본 메시지 + contents = "

404 - File Not Found

The requested file was not found: " + filePath + "

"; + } + + //공용값 적용 + ApplyCommonValue(ref contents); + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + contents, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/ItemController.cs b/Project/Web/Controller/ItemController.cs similarity index 96% rename from Project/Controller/ItemController.cs rename to Project/Web/Controller/ItemController.cs index a92d9e5..b93d019 100644 --- a/Project/Controller/ItemController.cs +++ b/Project/Web/Controller/ItemController.cs @@ -1,153 +1,153 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; -using System.Windows.Forms; - -namespace Project -{ - public class ItemController : BaseController - { - - - // PUT api/values/5 - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - [HttpGet] - public HttpResponseMessage Find() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - if (searchkey.isEmpty() == false && searchkey != "%") - { - if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey; - if (searchkey.EndsWith("%") == false) searchkey = searchkey + "%"; - } - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - if (searchkey.isEmpty() == false) - { - var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain(); - var rows = db.GetData(searchkey);// .vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.model.Contains(searchkey)); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.Location}"); - tbody.AppendLine($"{item.sid}"); - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.model}"); - - if (item.IspriceNull()) - tbody.AppendLine($"--"); - else - { - var price = (double)item.price / 1000.0; - - tbody.AppendLine($"{price.ToString("N0")}"); - } - - - tbody.AppendLine($"{item.manu}"); - tbody.AppendLine($"{item.supply}"); - - if (item.remark.Length > 10) - tbody.AppendLine($"{item.remark.Substring(0, 10)}..."); - else - tbody.AppendLine($"{item.remark}"); - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; +using System.Windows.Forms; + +namespace Project.Web.Controllers +{ + public class ItemController : BaseController + { + + + // PUT api/values/5 + public void Put(int id, [FromBody] string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string Test() + { + return "test"; + } + + [HttpGet] + public HttpResponseMessage Find() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + if (searchkey.isEmpty() == false && searchkey != "%") + { + if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey; + if (searchkey.EndsWith("%") == false) searchkey = searchkey + "%"; + } + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + if (searchkey.isEmpty() == false) + { + var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain(); + var rows = db.GetData(searchkey);// .vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.model.Contains(searchkey)); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.Location}"); + tbody.AppendLine($"{item.sid}"); + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.model}"); + + if (item.IspriceNull()) + tbody.AppendLine($"--"); + else + { + var price = (double)item.price / 1000.0; + + tbody.AppendLine($"{price.ToString("N0")}"); + } + + + tbody.AppendLine($"{item.manu}"); + tbody.AppendLine($"{item.supply}"); + + if (item.remark.Length > 10) + tbody.AppendLine($"{item.remark.Substring(0, 10)}..."); + else + tbody.AppendLine($"{item.remark}"); + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var contents = result.Content; + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/JobreportController.cs b/Project/Web/Controller/JobreportController.cs similarity index 97% rename from Project/Controller/JobreportController.cs rename to Project/Web/Controller/JobreportController.cs index d5d8e5e..a3b47a9 100644 --- a/Project/Controller/JobreportController.cs +++ b/Project/Web/Controller/JobreportController.cs @@ -1,380 +1,380 @@ -using Microsoft.Owin; -using System; -using System.Linq; -using System.Net.Http; -using System.Web; -using System.Web.Http; - -namespace Project -{ - public class JobreportController : BaseController - { - - - // PUT api/values/5 - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpPost] - public string Add(FormCollection tbpdate) - { - var vals = Request.GetQueryNameValuePairs(); - return string.Empty; - } - - //[HttpPost] - //public string Edit([FromBody] string value) - //{ - // var vals = Request.GetQueryNameValuePairs(); - - // var req = Request.GetRequestContext(); - - // return string.Empty; - //} - - [HttpPost] - public string Edit(FormCollection value) - { - var vals = Request.GetQueryNameValuePairs(); - - var req = Request.GetRequestContext(); - - return string.Empty; - } - - [HttpGet] - public HttpResponseMessage Edit(int id) - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View("/jobreport/edit"); - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();//. EEEntitiesJobreport(); - var sd = DateTime.Now.ToString("yyyy-MM-01"); - var ed = DateTime.Now.ToShortDateString(); - var rows = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();//.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault(); - - var contents = result.Content; - if (rows == null) - { - //아이템이 없는 메시지를 표시한다 - } - else - { - //치환작업을 진행한다 - contents = contents.Replace("{pdate}", rows.pdate); - contents = contents.Replace("{status}", rows.status); - contents = contents.Replace("{name}", rows.name); - contents = contents.Replace("{package}", rows.package); - contents = contents.Replace("{process}", rows.process); - contents = contents.Replace("{type}", rows.type); - contents = contents.Replace("{userProcess}", rows.userProcess); - contents = contents.Replace("{projectName}", rows.projectName); - contents = contents.Replace("{hrs}", rows.hrs.ToString()); - contents = contents.Replace("{ot}", rows.ot.ToString()); - contents = contents.Replace("{requestpart}", rows.requestpart); - contents = contents.Replace("{description}", rows.description); - - } - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - - [HttpGet] - public HttpResponseMessage Add() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View("/jobreport/add"); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - //if (searchkey.isEmpty() == false) - { - var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport(); - var sd = DateTime.Now.ToString("yyyy-MM-01"); - var ed = DateTime.Now.ToShortDateString(); - var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed); - //vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - - tbody.AppendLine($"{item.pdate.Substring(5)}"); - tbody.AppendLine($"{item.ww}"); - tbody.AppendLine($"{item.name}"); - - if (item.status == "진행 중" || item.status.EndsWith("%")) - tbody.AppendLine($"{item.status}"); - else - tbody.AppendLine($"{item.status}"); - - tbody.AppendLine($"{item.type}"); - tbody.AppendLine($"{item.projectName}"); - tbody.AppendLine($"{item.hrs}"); - tbody.AppendLine($"{item.ot}"); - - tbody.AppendLine(""); - tbody.AppendLine(item.description); - tbody.AppendLine(""); - - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Find() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - if (searchkey.isEmpty() == false) - { - var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport(); - var sd = DateTime.Now.ToShortDateString(); - var rows = db.GetByToday(FCOMMON.info.Login.gcode, sd);//.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) == 0).OrderBy(t => t.name); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.pdate}"); - tbody.AppendLine($"{item.status}"); - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.projectName}"); - tbody.AppendLine($"{item.hrs}"); - tbody.AppendLine($"{item.ot}"); - tbody.AppendLine($"{item.description}"); - - - if (item.description.Length > 10) - tbody.AppendLine($"{item.description.Substring(0, 10)}..."); - else - tbody.AppendLine($"{item.description}"); - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - //if (searchkey.isEmpty() == false) - { - var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport(); - var sd = DateTime.Now.ToShortDateString(); - var ed = DateTime.Now.ToShortDateString(); - var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed); - //.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - - tbody.AppendLine($"{item.pdate.Substring(5)}"); - tbody.AppendLine($"{item.ww}"); - tbody.AppendLine($"{item.name}"); - - if (item.status == "진행 중" || item.status.EndsWith("%")) - tbody.AppendLine($"{item.status}"); - else - tbody.AppendLine($"{item.status}"); - - tbody.AppendLine($"{item.type}"); - tbody.AppendLine($"{item.projectName}"); - tbody.AppendLine($"{item.hrs}"); - tbody.AppendLine($"{item.ot}"); - - tbody.AppendLine(""); - tbody.AppendLine(item.description); - tbody.AppendLine(""); - - tbody.AppendLine(""); - } - } - - - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using Microsoft.Owin; +using System; +using System.Linq; +using System.Net.Http; +using System.Web; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class JobreportController : BaseController + { + + + // PUT api/values/5 + public void Put(int id, [FromBody] string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpPost] + public string Add(FormCollection tbpdate) + { + var vals = Request.GetQueryNameValuePairs(); + return string.Empty; + } + + //[HttpPost] + //public string Edit([FromBody] string value) + //{ + // var vals = Request.GetQueryNameValuePairs(); + + // var req = Request.GetRequestContext(); + + // return string.Empty; + //} + + [HttpPost] + public string Edit(FormCollection value) + { + var vals = Request.GetQueryNameValuePairs(); + + var req = Request.GetRequestContext(); + + return string.Empty; + } + + [HttpGet] + public HttpResponseMessage Edit(int id) + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View("/jobreport/edit"); + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();//. EEEntitiesJobreport(); + var sd = DateTime.Now.ToString("yyyy-MM-01"); + var ed = DateTime.Now.ToShortDateString(); + var rows = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();//.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault(); + + var contents = result.Content; + if (rows == null) + { + //아이템이 없는 메시지를 표시한다 + } + else + { + //치환작업을 진행한다 + contents = contents.Replace("{pdate}", rows.pdate); + contents = contents.Replace("{status}", rows.status); + contents = contents.Replace("{name}", rows.name); + contents = contents.Replace("{package}", rows.package); + contents = contents.Replace("{process}", rows.process); + contents = contents.Replace("{type}", rows.type); + contents = contents.Replace("{userProcess}", rows.userProcess); + contents = contents.Replace("{projectName}", rows.projectName); + contents = contents.Replace("{hrs}", rows.hrs.ToString()); + contents = contents.Replace("{ot}", rows.ot.ToString()); + contents = contents.Replace("{requestpart}", rows.requestpart); + contents = contents.Replace("{description}", rows.description); + + } + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + + [HttpGet] + public HttpResponseMessage Add() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View("/jobreport/add"); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + { + var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport(); + var sd = DateTime.Now.ToString("yyyy-MM-01"); + var ed = DateTime.Now.ToShortDateString(); + var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed); + //vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + + tbody.AppendLine($"{item.pdate.Substring(5)}"); + tbody.AppendLine($"{item.ww}"); + tbody.AppendLine($"{item.name}"); + + if (item.status == "진행 중" || item.status.EndsWith("%")) + tbody.AppendLine($"{item.status}"); + else + tbody.AppendLine($"{item.status}"); + + tbody.AppendLine($"{item.type}"); + tbody.AppendLine($"{item.projectName}"); + tbody.AppendLine($"{item.hrs}"); + tbody.AppendLine($"{item.ot}"); + + tbody.AppendLine(""); + tbody.AppendLine(item.description); + tbody.AppendLine(""); + + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Find() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + if (searchkey.isEmpty() == false) + { + var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport(); + var sd = DateTime.Now.ToShortDateString(); + var rows = db.GetByToday(FCOMMON.info.Login.gcode, sd);//.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) == 0).OrderBy(t => t.name); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.pdate}"); + tbody.AppendLine($"{item.status}"); + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.projectName}"); + tbody.AppendLine($"{item.hrs}"); + tbody.AppendLine($"{item.ot}"); + tbody.AppendLine($"{item.description}"); + + + if (item.description.Length > 10) + tbody.AppendLine($"{item.description.Substring(0, 10)}..."); + else + tbody.AppendLine($"{item.description}"); + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + { + var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport(); + var sd = DateTime.Now.ToShortDateString(); + var ed = DateTime.Now.ToShortDateString(); + var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed); + //.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + + tbody.AppendLine($"{item.pdate.Substring(5)}"); + tbody.AppendLine($"{item.ww}"); + tbody.AppendLine($"{item.name}"); + + if (item.status == "진행 중" || item.status.EndsWith("%")) + tbody.AppendLine($"{item.status}"); + else + tbody.AppendLine($"{item.status}"); + + tbody.AppendLine($"{item.type}"); + tbody.AppendLine($"{item.projectName}"); + tbody.AppendLine($"{item.hrs}"); + tbody.AppendLine($"{item.ot}"); + + tbody.AppendLine(""); + tbody.AppendLine(item.description); + tbody.AppendLine(""); + + tbody.AppendLine(""); + } + } + + + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/ManualController.cs b/Project/Web/Controller/ManualController.cs similarity index 95% rename from Project/Controller/ManualController.cs rename to Project/Web/Controller/ManualController.cs index 0231134..db09e5f 100644 --- a/Project/Controller/ManualController.cs +++ b/Project/Web/Controller/ManualController.cs @@ -1,88 +1,88 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class ManualController : BaseController - { - [HttpPost] - public void Index([FromBody]string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - - } - - [HttpGet] - public HttpResponseMessage Page(string id) - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View($"\\Manual\\{id}"); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class ManualController : BaseController + { + [HttpPost] + public void Index([FromBody]string value) + { + + } + + // PUT api/values/5 + public void Put(int id, [FromBody]string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + + } + + [HttpGet] + public HttpResponseMessage Page(string id) + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View($"\\Manual\\{id}"); + + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var contents = result.Content; + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var contents = result.Content; + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/ProjectController.cs b/Project/Web/Controller/ProjectController.cs similarity index 97% rename from Project/Controller/ProjectController.cs rename to Project/Web/Controller/ProjectController.cs index 72c2295..7ff6b62 100644 --- a/Project/Controller/ProjectController.cs +++ b/Project/Web/Controller/ProjectController.cs @@ -1,471 +1,471 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class ProjectController : BaseController - { - - - // PUT api/values/5 - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - [HttpGet] - public HttpResponseMessage Find() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - if (searchkey.isEmpty() == false) - { - //var db = new EEEntitiesProject(); - - - //var rows = db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50); - - //itemcnt = rows.Count(); - //foreach (var item in rows) - //{ - // tbody.AppendLine(""); - // tbody.AppendLine($"{item.pdate}"); - // tbody.AppendLine($"{item.name}"); - - - // //if (item.description.Length > 10) - // // tbody.AppendLine($"{item.description.Substring(0, 10)}..."); - // //else - // // tbody.AppendLine($"{item.description}"); - // tbody.AppendLine(""); - //} - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - - - [HttpGet] - public HttpResponseMessage ScheduleConfirm(int? id) - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - var project = (int)id; - - //데이터를 조회해서 표시를 해준다. - var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); - var prjinfo = db.GetData(FCOMMON.info.Login.gcode, project).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == project).FirstOrDefault(); - - var taSch = new dsProjectsTableAdapters.EETGW_ProjectsScheduleTableAdapter(); - var schrows = taSch.GetData(FCOMMON.info.Login.gcode, project);//. db.EETGW_ProjectsSchedule.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == project).OrderByDescending(t => t.project).OrderByDescending(t => t.no).OrderBy(t => t.seq); - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - System.Text.StringBuilder tinfo = new System.Text.StringBuilder(); - //프로젝트정보를 표시합니다. - tinfo.AppendLine(""); - tinfo.AppendLine(string.Format("{0}", prjinfo.idx)); - tinfo.AppendLine(string.Format("{0}", prjinfo.status)); - tinfo.AppendLine(string.Format("{0}", prjinfo.progress)); - tinfo.AppendLine(string.Format("{0}", prjinfo.name)); - tinfo.AppendLine(string.Format("{0}", prjinfo.reqstaff)); - tinfo.AppendLine(string.Format("{0}", prjinfo.userManager)); - tinfo.AppendLine(string.Format("{0}", prjinfo.orderno)); - tinfo.AppendLine(""); - - - var contents = result.Content.Replace("{search}", ""); - contents = contents.Replace("{tableinfo}", tinfo.ToString()); - - tinfo.Clear(); - foreach (var item in schrows) - { - tinfo.AppendLine(""); - tinfo.AppendLine(string.Format("{0}", item.no)); - tinfo.AppendLine(string.Format("{0}", item.seq)); - tinfo.AppendLine(string.Format("{0}", item.title)); - tinfo.AppendLine(string.Format("{0}", item.sw)); - tinfo.AppendLine(string.Format("{0}", item.ew)); - tinfo.AppendLine(string.Format("{0}", item.swa)); - tinfo.AppendLine(string.Format("{0}", item.ewa)); - tinfo.AppendLine(string.Format("{0}", item.progress)); - tinfo.AppendLine(string.Format("{0}", item.uid)); - tinfo.AppendLine(string.Format("{0}", item.memo)); - tinfo.AppendLine(""); - } - contents = contents.Replace("{scheinfo}", tinfo.ToString()); - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - //if (searchkey.isEmpty() == false) - { - - var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); - - - var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);//.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50); - - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.idx}"); - tbody.AppendLine($"{item.status}"); - tbody.AppendLine($"{item.progress}"); - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.reqstaff}"); - tbody.AppendLine($"{item.userManager}"); - tbody.AppendLine($"{item.cnt}"); - tbody.AppendLine($"{item.costo}"); - tbody.AppendLine($"{item.costn}"); - tbody.AppendLine($"{item.costo - item.costn}"); - tbody.AppendLine($"{item.orderno}"); - if (item.memo != null) - tbody.AppendLine($"{item.memo}"); - else - tbody.AppendLine($" "); - - - - //if (item.description.Length > 10) - // tbody.AppendLine($"{item.description.Substring(0, 10)}..."); - //else - // tbody.AppendLine($"{item.description}"); - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage detail(int id) - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - //if (searchkey.isEmpty() == false) - { - - var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); - - - var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50); - - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.idx}"); - tbody.AppendLine($"{item.status}"); - tbody.AppendLine($"{item.progress}"); - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.reqstaff}"); - tbody.AppendLine($"{item.userManager}"); - tbody.AppendLine($"{item.cnt}"); - tbody.AppendLine($"{item.costo}"); - tbody.AppendLine($"{item.costn}"); - tbody.AppendLine($"{item.costo - item.costn}"); - tbody.AppendLine($"{item.orderno}"); - if (item.memo != null) - tbody.AppendLine($"{item.memo}"); - else - tbody.AppendLine($" "); - - - - //if (item.description.Length > 10) - // tbody.AppendLine($"{item.description.Substring(0, 10)}..."); - //else - // tbody.AppendLine($"{item.description}"); - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - contents = contents.Replace("{pidx}", id.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage partlist(int id) - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - - var contents = result.Content.Replace("{search}", searchkey); - - - //테이블데이터생성 - var itemcnt = 0; - //if (searchkey.isEmpty() == false) - { - - var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); - - var prjinfo = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault(); - System.Text.StringBuilder tinfo = new System.Text.StringBuilder(); - //프로젝트정보를 표시합니다. - tinfo.AppendLine(""); - tinfo.AppendLine(string.Format("{0}", prjinfo.idx)); - tinfo.AppendLine(string.Format("{0}", prjinfo.status)); - tinfo.AppendLine(string.Format("{0}", prjinfo.progress)); - tinfo.AppendLine(string.Format("{0}", prjinfo.name)); - tinfo.AppendLine(string.Format("{0}", prjinfo.reqstaff)); - tinfo.AppendLine(string.Format("{0}", prjinfo.userManager)); - tinfo.AppendLine(string.Format("{0}", prjinfo.orderno)); - tinfo.AppendLine(""); - - contents = contents.Replace("{tableinfo}", tinfo.ToString()); - - var taPart = new dsProjectsTableAdapters.ProjectsPartTableAdapter(); - var rows = taPart.GetData(id);// db.ProjectsPart.Where(t => t.Project == id).OrderBy(t=>t.no); - - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.no}"); - tbody.AppendLine($"{item.ItemGroup}"); - tbody.AppendLine($"{item.ItemModel}"); - tbody.AppendLine($"{item.ItemUnit}"); - tbody.AppendLine($"{item.ItemName}"); - tbody.AppendLine($"{item.ItemSid}"); - tbody.AppendLine($"{item.ItemManu}"); - tbody.AppendLine($"{item.qty}"); - tbody.AppendLine($"{item.qtyn}"); - tbody.AppendLine($"{item.price}"); - tbody.AppendLine($"{item.amt}"); - tbody.AppendLine($"{item.amtn}"); - tbody.AppendLine($"{item.remark}"); - tbody.AppendLine($"{item.qtybuy}"); - tbody.AppendLine($"{item.qtyin}"); - tbody.AppendLine($"{item.bbuy}"); - tbody.AppendLine($"{item.bconfirm}"); - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - contents = contents.Replace("{pidx}", id.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class ProjectController : BaseController + { + + + // PUT api/values/5 + public void Put(int id, [FromBody] string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string Test() + { + return "test"; + } + + [HttpGet] + public HttpResponseMessage Find() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + if (searchkey.isEmpty() == false) + { + //var db = new EEEntitiesProject(); + + + //var rows = db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50); + + //itemcnt = rows.Count(); + //foreach (var item in rows) + //{ + // tbody.AppendLine(""); + // tbody.AppendLine($"{item.pdate}"); + // tbody.AppendLine($"{item.name}"); + + + // //if (item.description.Length > 10) + // // tbody.AppendLine($"{item.description.Substring(0, 10)}..."); + // //else + // // tbody.AppendLine($"{item.description}"); + // tbody.AppendLine(""); + //} + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + + + [HttpGet] + public HttpResponseMessage ScheduleConfirm(int? id) + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + var project = (int)id; + + //데이터를 조회해서 표시를 해준다. + var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); + var prjinfo = db.GetData(FCOMMON.info.Login.gcode, project).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == project).FirstOrDefault(); + + var taSch = new dsProjectsTableAdapters.EETGW_ProjectsScheduleTableAdapter(); + var schrows = taSch.GetData(FCOMMON.info.Login.gcode, project);//. db.EETGW_ProjectsSchedule.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == project).OrderByDescending(t => t.project).OrderByDescending(t => t.no).OrderBy(t => t.seq); + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + System.Text.StringBuilder tinfo = new System.Text.StringBuilder(); + //프로젝트정보를 표시합니다. + tinfo.AppendLine(""); + tinfo.AppendLine(string.Format("{0}", prjinfo.idx)); + tinfo.AppendLine(string.Format("{0}", prjinfo.status)); + tinfo.AppendLine(string.Format("{0}", prjinfo.progress)); + tinfo.AppendLine(string.Format("{0}", prjinfo.name)); + tinfo.AppendLine(string.Format("{0}", prjinfo.reqstaff)); + tinfo.AppendLine(string.Format("{0}", prjinfo.userManager)); + tinfo.AppendLine(string.Format("{0}", prjinfo.orderno)); + tinfo.AppendLine(""); + + + var contents = result.Content.Replace("{search}", ""); + contents = contents.Replace("{tableinfo}", tinfo.ToString()); + + tinfo.Clear(); + foreach (var item in schrows) + { + tinfo.AppendLine(""); + tinfo.AppendLine(string.Format("{0}", item.no)); + tinfo.AppendLine(string.Format("{0}", item.seq)); + tinfo.AppendLine(string.Format("{0}", item.title)); + tinfo.AppendLine(string.Format("{0}", item.sw)); + tinfo.AppendLine(string.Format("{0}", item.ew)); + tinfo.AppendLine(string.Format("{0}", item.swa)); + tinfo.AppendLine(string.Format("{0}", item.ewa)); + tinfo.AppendLine(string.Format("{0}", item.progress)); + tinfo.AppendLine(string.Format("{0}", item.uid)); + tinfo.AppendLine(string.Format("{0}", item.memo)); + tinfo.AppendLine(""); + } + contents = contents.Replace("{scheinfo}", tinfo.ToString()); + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + { + + var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); + + + var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);//.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50); + + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.idx}"); + tbody.AppendLine($"{item.status}"); + tbody.AppendLine($"{item.progress}"); + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.reqstaff}"); + tbody.AppendLine($"{item.userManager}"); + tbody.AppendLine($"{item.cnt}"); + tbody.AppendLine($"{item.costo}"); + tbody.AppendLine($"{item.costn}"); + tbody.AppendLine($"{item.costo - item.costn}"); + tbody.AppendLine($"{item.orderno}"); + if (item.memo != null) + tbody.AppendLine($"{item.memo}"); + else + tbody.AppendLine($" "); + + + + //if (item.description.Length > 10) + // tbody.AppendLine($"{item.description.Substring(0, 10)}..."); + //else + // tbody.AppendLine($"{item.description}"); + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage detail(int id) + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + { + + var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); + + + var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50); + + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.idx}"); + tbody.AppendLine($"{item.status}"); + tbody.AppendLine($"{item.progress}"); + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.reqstaff}"); + tbody.AppendLine($"{item.userManager}"); + tbody.AppendLine($"{item.cnt}"); + tbody.AppendLine($"{item.costo}"); + tbody.AppendLine($"{item.costn}"); + tbody.AppendLine($"{item.costo - item.costn}"); + tbody.AppendLine($"{item.orderno}"); + if (item.memo != null) + tbody.AppendLine($"{item.memo}"); + else + tbody.AppendLine($" "); + + + + //if (item.description.Length > 10) + // tbody.AppendLine($"{item.description.Substring(0, 10)}..."); + //else + // tbody.AppendLine($"{item.description}"); + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + contents = contents.Replace("{pidx}", id.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage partlist(int id) + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + + var contents = result.Content.Replace("{search}", searchkey); + + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + { + + var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject(); + + var prjinfo = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault(); + System.Text.StringBuilder tinfo = new System.Text.StringBuilder(); + //프로젝트정보를 표시합니다. + tinfo.AppendLine(""); + tinfo.AppendLine(string.Format("{0}", prjinfo.idx)); + tinfo.AppendLine(string.Format("{0}", prjinfo.status)); + tinfo.AppendLine(string.Format("{0}", prjinfo.progress)); + tinfo.AppendLine(string.Format("{0}", prjinfo.name)); + tinfo.AppendLine(string.Format("{0}", prjinfo.reqstaff)); + tinfo.AppendLine(string.Format("{0}", prjinfo.userManager)); + tinfo.AppendLine(string.Format("{0}", prjinfo.orderno)); + tinfo.AppendLine(""); + + contents = contents.Replace("{tableinfo}", tinfo.ToString()); + + var taPart = new dsProjectsTableAdapters.ProjectsPartTableAdapter(); + var rows = taPart.GetData(id);// db.ProjectsPart.Where(t => t.Project == id).OrderBy(t=>t.no); + + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.no}"); + tbody.AppendLine($"{item.ItemGroup}"); + tbody.AppendLine($"{item.ItemModel}"); + tbody.AppendLine($"{item.ItemUnit}"); + tbody.AppendLine($"{item.ItemName}"); + tbody.AppendLine($"{item.ItemSid}"); + tbody.AppendLine($"{item.ItemManu}"); + tbody.AppendLine($"{item.qty}"); + tbody.AppendLine($"{item.qtyn}"); + tbody.AppendLine($"{item.price}"); + tbody.AppendLine($"{item.amt}"); + tbody.AppendLine($"{item.amtn}"); + tbody.AppendLine($"{item.remark}"); + tbody.AppendLine($"{item.qtybuy}"); + tbody.AppendLine($"{item.qtyin}"); + tbody.AppendLine($"{item.bbuy}"); + tbody.AppendLine($"{item.bconfirm}"); + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + contents = contents.Replace("{pidx}", id.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/PurchaseController.cs b/Project/Web/Controller/PurchaseController.cs similarity index 97% rename from Project/Controller/PurchaseController.cs rename to Project/Web/Controller/PurchaseController.cs index f2d1512..7d19919 100644 --- a/Project/Controller/PurchaseController.cs +++ b/Project/Web/Controller/PurchaseController.cs @@ -1,215 +1,215 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; -using System.Windows.Forms; - -namespace Project -{ - public class PurchaseController : BaseController - { - - - // PUT api/values/5 - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - [HttpGet] - public HttpResponseMessage Find() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - if(searchkey.isEmpty()==false && searchkey != "%") - { - if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey; - if (searchkey.EndsWith("%") == false) searchkey += "%"; - } - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - if (searchkey.isEmpty() == false) - { - var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain(); - var rows = db.GetData(searchkey);//.vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.manu.Contains(searchkey) || t.model.Contains(searchkey)); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.Location}"); - tbody.AppendLine($"{item.sid}"); - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.model}"); - - if (item.IspriceNull()) - tbody.AppendLine($"--"); - else - { - var price = (double)item.price / 1000.0; - - tbody.AppendLine($"{price.ToString("N0")}"); - } - - - tbody.AppendLine($"{item.manu}"); - tbody.AppendLine($"{item.supply}"); - - if (item.remark.Length > 10) - tbody.AppendLine($"{item.remark.Substring(0, 10)}..."); - else - tbody.AppendLine($"{item.remark}"); - tbody.AppendLine(""); - } - } - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - - var gets = Request.GetQueryNameValuePairs();// GetParameters(data); - - - var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var searchkey = string.Empty; - if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); - - var tbody = new System.Text.StringBuilder(); - - //테이블데이터생성 - var itemcnt = 0; - //if (searchkey.isEmpty() == false) - //{ - var db = new dsMSSQLTableAdapters.vPurchaseTableAdapter();// EEEntitiesPurchase(); - var sd = DateTime.Now.ToString("yyyy-MM-01"); - var rows = db.GetAfter(FCOMMON.info.Login.gcode, sd);// .vPurchase.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) >= 0).OrderByDescending(t => t.pdate); - itemcnt = rows.Count(); - foreach (var item in rows) - { - tbody.AppendLine(""); - tbody.AppendLine($"{item.pdate.Substring(5)}"); - - if (item.state == "---") tbody.AppendLine($"{item.state}"); - else if (item.state == "Received") tbody.AppendLine($"{item.state}"); - else tbody.AppendLine($"{item.state}"); - - tbody.AppendLine($"{item.name}"); - tbody.AppendLine($"{item.sid}"); - tbody.AppendLine($"{item.pumname}"); - - if (item.pumscale.Length > 10) tbody.AppendLine($"{item.pumscale.Substring(0, 10)}..."); - else tbody.AppendLine($"{item.pumscale}"); - - tbody.AppendLine($"{item.pumqty}"); - tbody.AppendLine($"{item.pumprice}"); - tbody.AppendLine($"{item.pumamt}"); - tbody.AppendLine($"{item.supply}"); - if (item.project != null && item.project.Length > 10) tbody.AppendLine($"{item.project.Substring(0, 10)}..."); - else tbody.AppendLine($"{item.project}"); - - if (item.bigo.Length > 10) tbody.AppendLine($"{item.bigo.Substring(0, 10)}..."); - else tbody.AppendLine($"{item.bigo}"); - tbody.AppendLine(""); - } - //} - - //아잍쳄이 없는경우 - if (itemcnt == 0) - { - tbody.AppendLine(""); - tbody.AppendLine("1"); - tbody.AppendLine("자료가 없습니다"); - tbody.AppendLine(""); - } - - - var contents = result.Content.Replace("{search}", searchkey); - contents = contents.Replace("{tabledata}", tbody.ToString()); - contents = contents.Replace("{cnt}", itemcnt.ToString()); - - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; +using System.Windows.Forms; + +namespace Project.Web.Controllers +{ + public class PurchaseController : BaseController + { + + + // PUT api/values/5 + public void Put(int id, [FromBody] string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string Test() + { + return "test"; + } + + [HttpGet] + public HttpResponseMessage Find() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + if(searchkey.isEmpty()==false && searchkey != "%") + { + if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey; + if (searchkey.EndsWith("%") == false) searchkey += "%"; + } + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + if (searchkey.isEmpty() == false) + { + var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain(); + var rows = db.GetData(searchkey);//.vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.manu.Contains(searchkey) || t.model.Contains(searchkey)); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.Location}"); + tbody.AppendLine($"{item.sid}"); + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.model}"); + + if (item.IspriceNull()) + tbody.AppendLine($"--"); + else + { + var price = (double)item.price / 1000.0; + + tbody.AppendLine($"{price.ToString("N0")}"); + } + + + tbody.AppendLine($"{item.manu}"); + tbody.AppendLine($"{item.supply}"); + + if (item.remark.Length > 10) + tbody.AppendLine($"{item.remark.Substring(0, 10)}..."); + else + tbody.AppendLine($"{item.remark}"); + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + //{ + var db = new dsMSSQLTableAdapters.vPurchaseTableAdapter();// EEEntitiesPurchase(); + var sd = DateTime.Now.ToString("yyyy-MM-01"); + var rows = db.GetAfter(FCOMMON.info.Login.gcode, sd);// .vPurchase.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) >= 0).OrderByDescending(t => t.pdate); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + tbody.AppendLine($"{item.pdate.Substring(5)}"); + + if (item.state == "---") tbody.AppendLine($"{item.state}"); + else if (item.state == "Received") tbody.AppendLine($"{item.state}"); + else tbody.AppendLine($"{item.state}"); + + tbody.AppendLine($"{item.name}"); + tbody.AppendLine($"{item.sid}"); + tbody.AppendLine($"{item.pumname}"); + + if (item.pumscale.Length > 10) tbody.AppendLine($"{item.pumscale.Substring(0, 10)}..."); + else tbody.AppendLine($"{item.pumscale}"); + + tbody.AppendLine($"{item.pumqty}"); + tbody.AppendLine($"{item.pumprice}"); + tbody.AppendLine($"{item.pumamt}"); + tbody.AppendLine($"{item.supply}"); + if (item.project != null && item.project.Length > 10) tbody.AppendLine($"{item.project.Substring(0, 10)}..."); + else tbody.AppendLine($"{item.project}"); + + if (item.bigo.Length > 10) tbody.AppendLine($"{item.bigo.Substring(0, 10)}..."); + else tbody.AppendLine($"{item.bigo}"); + tbody.AppendLine(""); + } + //} + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/ResourceController.cs b/Project/Web/Controller/ResourceController.cs similarity index 96% rename from Project/Controller/ResourceController.cs rename to Project/Web/Controller/ResourceController.cs index 2262309..8767776 100644 --- a/Project/Controller/ResourceController.cs +++ b/Project/Web/Controller/ResourceController.cs @@ -1,155 +1,156 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Text; -using System.Threading.Tasks; -using System.Web.Http; -namespace Project -{ - public class ResourceController : BaseController - { - //[HttpGet] - //public HttpResponseMessage Index() - //{ - // //로그인이 되어있지않다면 로그인을 가져온다 - // MethodResult result; - // result = View(true); - - // var model = GetGlobalModel(); - // var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - // //기본값을 찾아서 없애줘야한다 - // var contents = result.Content; - - // //공용값 적용 - // ApplyCommonValue(ref contents); - - // //최종문자 적용 - // result.Content = contents; - - // var resp = new HttpResponseMessage() - // { - // Content = new StringContent( - // result.Content, - // System.Text.Encoding.UTF8, - // "text/html") - // }; - - // return resp; - //} - - [HttpGet] - public HttpResponseMessage file() - { - var config = RequestContext.Configuration; - var routeData = config.Routes.GetRouteData(Request).Values.ToList(); - - var p_resource = routeData.Where(t => t.Key == "resource").FirstOrDefault(); - var p_path = routeData.Where(t => t.Key == "path").FirstOrDefault(); - var p_ext = routeData.Where(t => t.Key == "ext").FirstOrDefault(); - var p_subdir = routeData.Where(t => t.Key == "subdir").FirstOrDefault(); - - var v_resource = string.Empty; - var v_path = string.Empty; - var v_ext = string.Empty; - var v_subdir = string.Empty; - - if (p_resource.Key == "resource") v_resource = p_resource.Value.ToString(); - if (p_path.Key == "path") v_path = p_path.Value.ToString(); - if (p_ext.Key == "ext") v_ext = p_ext.Value.ToString(); - if (p_subdir.Key == "subdir") v_subdir = p_subdir.Value.ToString(); - - //var file_ext = routeData[0].Value.ToString(); - //var name_resource = routeData[1].Value.ToString() + "." + file_ext; - //var name_action = routeData[3].Value.ToString(); - - Boolean isBinary = true; - - - string content_type = "text/plain"; - - if (v_ext == "json") - { - isBinary = false; - content_type = "application/json"; - } - else if(v_ext == "vue") - { - isBinary = false; - content_type = "application/js"; - } - else if (v_ext == "js") - { - isBinary = false; - content_type = "application/js"; - } - else if (v_ext == "css") - { - isBinary = false; - content_type = "text/css"; - } - else if (v_ext == "csv") - { - isBinary = false; - content_type = "text/csv"; - } - else if (v_ext == "ico") - { - isBinary = true; - content_type = "image/x-icon"; - } - else if(v_ext == "ttf" || v_ext == "otf") - { - isBinary = true; - content_type = "application/octet-stream"; - } - - HttpContent resultContent = null; - - if (v_resource.isEmpty() && v_ext.isEmpty()) - { - v_resource = "index"; - v_ext = "html"; - isBinary = false; - content_type = "text/html"; - } - - - - var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", v_path, v_subdir, v_resource + "." + v_ext); - - if (isBinary) - { - - if (System.IO.File.Exists(file)) - { - var buffer = System.IO.File.ReadAllBytes(file); - resultContent = new ByteArrayContent(buffer); - Console.WriteLine(">>File(B) : " + file); - } - else Console.WriteLine("no resouoir file " + file); - - } - else - { - if (System.IO.File.Exists(file)) - { - - var buffer = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); - resultContent = new StringContent(buffer, System.Text.Encoding.UTF8, content_type); - Console.WriteLine(">>File(S) : " + file); - } - else Console.WriteLine("no resouoir file " + file); - } - - - return new HttpResponseMessage() - { - Content = resultContent - }; - - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class ResourceController : BaseController + { + //[HttpGet] + //public HttpResponseMessage Index() + //{ + // //로그인이 되어있지않다면 로그인을 가져온다 + // MethodResult result; + // result = View(true); + + // var model = GetGlobalModel(); + // var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + // //기본값을 찾아서 없애줘야한다 + // var contents = result.Content; + + // //공용값 적용 + // ApplyCommonValue(ref contents); + + // //최종문자 적용 + // result.Content = contents; + + // var resp = new HttpResponseMessage() + // { + // Content = new StringContent( + // result.Content, + // System.Text.Encoding.UTF8, + // "text/html") + // }; + + // return resp; + //} + + [HttpGet] + public HttpResponseMessage file() + { + var config = RequestContext.Configuration; + var routeData = config.Routes.GetRouteData(Request).Values.ToList(); + + var p_resource = routeData.Where(t => t.Key == "resource").FirstOrDefault(); + var p_path = routeData.Where(t => t.Key == "path").FirstOrDefault(); + var p_ext = routeData.Where(t => t.Key == "ext").FirstOrDefault(); + var p_subdir = routeData.Where(t => t.Key == "subdir").FirstOrDefault(); + + var v_resource = string.Empty; + var v_path = string.Empty; + var v_ext = string.Empty; + var v_subdir = string.Empty; + + if (p_resource.Key == "resource") v_resource = p_resource.Value.ToString(); + if (p_path.Key == "path") v_path = p_path.Value.ToString(); + if (p_ext.Key == "ext") v_ext = p_ext.Value.ToString(); + if (p_subdir.Key == "subdir") v_subdir = p_subdir.Value.ToString(); + + //var file_ext = routeData[0].Value.ToString(); + //var name_resource = routeData[1].Value.ToString() + "." + file_ext; + //var name_action = routeData[3].Value.ToString(); + + Boolean isBinary = true; + + + string content_type = "text/plain"; + + if (v_ext == "json") + { + isBinary = false; + content_type = "application/json"; + } + else if(v_ext == "vue") + { + isBinary = false; + content_type = "application/js"; + } + else if (v_ext == "js") + { + isBinary = false; + content_type = "application/js"; + } + else if (v_ext == "css") + { + isBinary = false; + content_type = "text/css"; + } + else if (v_ext == "csv") + { + isBinary = false; + content_type = "text/csv"; + } + else if (v_ext == "ico") + { + isBinary = true; + content_type = "image/x-icon"; + } + else if(v_ext == "ttf" || v_ext == "otf") + { + isBinary = true; + content_type = "application/octet-stream"; + } + + HttpContent resultContent = null; + + if (v_resource.isEmpty() && v_ext.isEmpty()) + { + v_resource = "index"; + v_ext = "html"; + isBinary = false; + content_type = "text/html"; + } + + + + var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", v_path, v_subdir, v_resource + "." + v_ext); + + if (isBinary) + { + + if (System.IO.File.Exists(file)) + { + var buffer = System.IO.File.ReadAllBytes(file); + resultContent = new ByteArrayContent(buffer); + Console.WriteLine(">>File(B) : " + file); + } + else Console.WriteLine("no resouoir file " + file); + + } + else + { + if (System.IO.File.Exists(file)) + { + + var buffer = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8); + resultContent = new StringContent(buffer, System.Text.Encoding.UTF8, content_type); + Console.WriteLine(">>File(S) : " + file); + } + else Console.WriteLine("no resouoir file " + file); + } + + + return new HttpResponseMessage() + { + Content = resultContent + }; + + } + } +} diff --git a/Project/Controller/ResultController.cs b/Project/Web/Controller/ResultController.cs similarity index 94% rename from Project/Controller/ResultController.cs rename to Project/Web/Controller/ResultController.cs index 6bd6c7b..bbdc2a5 100644 --- a/Project/Controller/ResultController.cs +++ b/Project/Web/Controller/ResultController.cs @@ -1,64 +1,64 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class ResultController : BaseController - { - [HttpPost] - public void Index([FromBody]string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class ResultController : BaseController + { + [HttpPost] + public void Index([FromBody]string value) + { + + } + + // PUT api/values/5 + public void Put(int id, [FromBody]string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string Test() + { + return "test"; + } + + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var contents = result.Content; + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Controller/SettingController.cs b/Project/Web/Controller/SettingController.cs similarity index 94% rename from Project/Controller/SettingController.cs rename to Project/Web/Controller/SettingController.cs index e567385..021616d 100644 --- a/Project/Controller/SettingController.cs +++ b/Project/Web/Controller/SettingController.cs @@ -1,63 +1,63 @@ -using System; -using System.Linq; -using System.Net.Http; -using System.Web.Http; - -namespace Project -{ - public class SettingController : BaseController - { - [HttpPost] - public void Index([FromBody]string value) - { - - } - - // PUT api/values/5 - public void Put(int id, [FromBody]string value) - { - } - - // DELETE api/values/5 - public void Delete(int id) - { - } - - [HttpGet] - public string Test() - { - return "test"; - } - - [HttpGet] - public HttpResponseMessage Index() - { - //로그인이 되어있지않다면 로그인을 가져온다 - MethodResult result; - result = View(); - - var model = GetGlobalModel(); - var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); - - //기본값을 찾아서 없애줘야한다 - var contents = result.Content; - - //공용값 적용 - ApplyCommonValue(ref contents); - - //최종문자 적용 - result.Content = contents; - - var resp = new HttpResponseMessage() - { - Content = new StringContent( - result.Content, - System.Text.Encoding.UTF8, - "text/html") - }; - - return resp; - } - - } -} +using System; +using System.Linq; +using System.Net.Http; +using System.Web.Http; + +namespace Project.Web.Controllers +{ + public class SettingController : BaseController + { + [HttpPost] + public void Index([FromBody]string value) + { + + } + + // PUT api/values/5 + public void Put(int id, [FromBody]string value) + { + } + + // DELETE api/values/5 + public void Delete(int id) + { + } + + [HttpGet] + public string Test() + { + return "test"; + } + + [HttpGet] + public HttpResponseMessage Index() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View(); + + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var contents = result.Content; + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; + } + + } +} diff --git a/Project/Model/PageModel.cs b/Project/Web/Model/PageModel.cs similarity index 54% rename from Project/Model/PageModel.cs rename to Project/Web/Model/PageModel.cs index eac12b0..dc96b1a 100644 --- a/Project/Model/PageModel.cs +++ b/Project/Web/Model/PageModel.cs @@ -1,18 +1,28 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Project -{ - public class PageModel - { - public List> RouteData { get; set; } - - - public string urlcontrol { get; set; } - public string urlaction { get; set; } - - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Project.Web.Model +{ + public class GroupUserModel + { + public string Gcode { get; set; } + public string uid { get; set; } + } + public class UserModel + { + public string uid { get; set; } + public string password { get; set; } + } + public class PageModel + { + public List> RouteData { get; set; } + + + public string urlcontrol { get; set; } + public string urlaction { get; set; } + + } +} diff --git a/Project/Web/Startup.cs b/Project/Web/Startup.cs new file mode 100644 index 0000000..a1c316d --- /dev/null +++ b/Project/Web/Startup.cs @@ -0,0 +1,88 @@ +using Microsoft.Owin; +using Microsoft.Owin.StaticFiles; +using Owin; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; +using System.Web.Http.Routing; +using Project.Web.Controllers; + +namespace Project.OWIN +{ + public class Startup + { + public void Configuration(IAppBuilder app) + { + // Configure Web API for Self-Host + HttpConfiguration config = new HttpConfiguration(); + + //라우팅 설정 + config.MapHttpAttributeRoutes(); + + config.Routes.MapHttpRoute( + name: "DefaultApi", + routeTemplate: "api/{controller}/{action}/{id}", + defaults: new { id = RouteParameter.Optional } + ); + + // JSON 포맷터 설정 + config.Formatters.JsonFormatter.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore; + + // 파일 업로드 설정 + config.Formatters.Remove(config.Formatters.XmlFormatter); + + app.UseCors(Microsoft.Owin.Cors.CorsOptions.AllowAll); + app.UseWebApi(config); + + // 정적 파일 서빙 설정 + var options = new FileServerOptions + { + EnableDefaultFiles = true, + DefaultFilesOptions = { DefaultFileNames = { "index.html" } }, + FileSystem = new Microsoft.Owin.FileSystems.PhysicalFileSystem("Web/wwwroot") + }; + + app.UseFileServer(options); + + // 캐시 방지 미들웨어 추가 + app.Use(async (context, next) => + { + if (context.Request.Path.Value.EndsWith(".js") || context.Request.Path.Value.EndsWith(".css")) + { + context.Response.Headers["Cache-Control"] = "no-cache, no-store, must-revalidate"; + context.Response.Headers["Pragma"] = "no-cache"; + context.Response.Headers["Expires"] = "0"; + } + await next(); + }); + + //appBuilder.UseFileServer(new FileServerOptions + //{ + // RequestPath = new PathString(string.Empty), + // FileSystem = new PhysicalFileSystem("./MySubFolder"), + // EnableDirectoryBrowsing = true, + //}); + + //appBuilder.UseStageMarker(PipelineStage.MapHandler); + + + //config.Routes.MapHttpRoute( + // name: "ignore", + // routeTemplate: @".*\.(css|js|gif|jpg)(/.*)?", + // defaults: new + // { + // controller = "file", + // action = "readtext", + // id = RouteParameter.Optional + // } + // ); + + + + } + + } +} diff --git a/Project/OWIN/StartupSSE.cs b/Project/Web/StartupSSE.cs similarity index 96% rename from Project/OWIN/StartupSSE.cs rename to Project/Web/StartupSSE.cs index 0e36865..0d0cece 100644 --- a/Project/OWIN/StartupSSE.cs +++ b/Project/Web/StartupSSE.cs @@ -1,101 +1,101 @@ -using Microsoft.Owin; -using Owin; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Web.Http; - -namespace Project.OWIN -{ - public class StartupSSE - { - - - public void Configuration(IAppBuilder app) - { - var api = new Api(); - app.Run(context => api.Invoke(context)); - } - - public class Subscriber - { - private StreamWriter _writer; - private TaskCompletionSource _tcs; - public Subscriber(Stream body, TaskCompletionSource tcs) - { - this._writer = new StreamWriter(body); - this._tcs = tcs; - } - - public async void WriteAsync(string message) - { - try - { - _writer.Write(message); - _writer.Flush(); - } - catch (Exception e) - { - if (e.HResult == -2146232800) // non-existent connection - _tcs.SetResult(true); - else - _tcs.SetException(e); - } - } - } - - public class Api - { - System.Timers.Timer _timer = new System.Timers.Timer(500); - List _subscribers = new List(); - public Api() - { - _timer.Elapsed += _timer_Elapsed; - } - - void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) - { - UpdateSubscribers(); - } - - public void UpdateSubscribers() - { - Console.WriteLine("updating {0} subscribers", _subscribers.Count); - var subscribersCopy = _subscribers.ToList(); - var msg = String.Format("Hello async at {0}\n", DateTime.Now); - subscribersCopy.ForEach(w => w.WriteAsync(msg)); - _timer.Start(); - } - - - public Task Invoke(IOwinContext context) - { - SetEventHeaders(context); - System.IO.Stream responseStream = context.Environment["owin.ResponseBody"] as Stream; - var tcs = new TaskCompletionSource(); - var s = CreateSubscriber(responseStream, tcs); - tcs.Task.ContinueWith(_ => _subscribers.Remove(s)); - Console.WriteLine("Add subscriber. Now have {0}", _subscribers.Count); - s.WriteAsync("Registered\n"); - _timer.Start(); - return tcs.Task; - } - - private Subscriber CreateSubscriber(System.IO.Stream responseStream, TaskCompletionSource tcs) - { - var s = new Subscriber(responseStream, tcs); - _subscribers.Add(s); - return s; - } - - private static void SetEventHeaders(IOwinContext context) - { - context.Response.ContentType = "text/eventstream"; - context.Response.Headers["Transfer-Encoding"] = "chunked"; - context.Response.Headers["cache-control"] = "no-cache"; - } - } - } -} +using Microsoft.Owin; +using Owin; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using System.Web.Http; + +namespace Project.OWIN +{ + public class StartupSSE + { + + + public void Configuration(IAppBuilder app) + { + var api = new Api(); + app.Run(context => api.Invoke(context)); + } + + public class Subscriber + { + private StreamWriter _writer; + private TaskCompletionSource _tcs; + public Subscriber(Stream body, TaskCompletionSource tcs) + { + this._writer = new StreamWriter(body); + this._tcs = tcs; + } + + public async void WriteAsync(string message) + { + try + { + _writer.Write(message); + _writer.Flush(); + } + catch (Exception e) + { + if (e.HResult == -2146232800) // non-existent connection + _tcs.SetResult(true); + else + _tcs.SetException(e); + } + } + } + + public class Api + { + System.Timers.Timer _timer = new System.Timers.Timer(500); + List _subscribers = new List(); + public Api() + { + _timer.Elapsed += _timer_Elapsed; + } + + void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) + { + UpdateSubscribers(); + } + + public void UpdateSubscribers() + { + Console.WriteLine("updating {0} subscribers", _subscribers.Count); + var subscribersCopy = _subscribers.ToList(); + var msg = String.Format("Hello async at {0}\n", DateTime.Now); + subscribersCopy.ForEach(w => w.WriteAsync(msg)); + _timer.Start(); + } + + + public Task Invoke(IOwinContext context) + { + SetEventHeaders(context); + System.IO.Stream responseStream = context.Environment["owin.ResponseBody"] as Stream; + var tcs = new TaskCompletionSource(); + var s = CreateSubscriber(responseStream, tcs); + tcs.Task.ContinueWith(_ => _subscribers.Remove(s)); + Console.WriteLine("Add subscriber. Now have {0}", _subscribers.Count); + s.WriteAsync("Registered\n"); + _timer.Start(); + return tcs.Task; + } + + private Subscriber CreateSubscriber(System.IO.Stream responseStream, TaskCompletionSource tcs) + { + var s = new Subscriber(responseStream, tcs); + _subscribers.Add(s); + return s; + } + + private static void SetEventHeaders(IOwinContext context) + { + context.Response.ContentType = "text/eventstream"; + context.Response.Headers["Transfer-Encoding"] = "chunked"; + context.Response.Headers["cache-control"] = "no-cache"; + } + } + } +} diff --git a/Project/Web/wwwroot/DashBoard/index.html b/Project/Web/wwwroot/DashBoard/index.html new file mode 100644 index 0000000..898f3a3 --- /dev/null +++ b/Project/Web/wwwroot/DashBoard/index.html @@ -0,0 +1,311 @@ + + + + + + 근태현황 대시보드 + + + + + +
+ +
+

근태현황 대시보드

+

실시간 근태 현황을 확인하세요

+
+ + +
+ +
+
+
+

출근

+

0

+
+
+ + + +
+
+
+ + +
+
+
+

휴가

+

0

+
+
+ + + +
+
+
+ + +
+
+
+

휴가요청

+

0

+
+
+ + + +
+
+
+ + +
+
+
+

구매요청

+

0

+
+
+ + + +
+
+
+
+ + +
+
+

+ + + + 휴가자 현황 +

+
+
+ + + + + + + + + + + + + +
이름휴가 종류시작일종료일사유
+
+
+ + + +
+ + + + \ No newline at end of file diff --git a/Project/View/dashboard.html b/Project/Web/wwwroot/dashboard.html similarity index 97% rename from Project/View/dashboard.html rename to Project/Web/wwwroot/dashboard.html index 0aa91dc..b4c50ff 100644 --- a/Project/View/dashboard.html +++ b/Project/Web/wwwroot/dashboard.html @@ -1,114 +1,114 @@ - - - - - - 근태현황 대시보드 - - - -
-
-
-
-
-
출근
-

0

-
-
-
-
-
-
-
휴가
-

0

-
-
-
-
-
-
-
휴가요청
-

0

-
-
-
-
-
-
-
구매요청
-

0

-
-
-
-
-
-
- 휴가자 현황 -
-
- - - - - - - - - - - - -
이름출근 시간퇴근 시간상태
-
-
-
- - - - + + + + + + 근태현황 대시보드 + + + +
+
+
+
+
+
출근
+

0

+
+
+
+
+
+
+
휴가
+

0

+
+
+
+
+
+
+
휴가요청
+

0

+
+
+
+
+
+
+
구매요청
+

0

+
+
+
+
+
+
+ 휴가자 현황 +
+
+ + + + + + + + + + + + +
이름출근 시간퇴근 시간상태
+
+
+
+ + + + diff --git a/Project/Web/wwwroot/index.html b/Project/Web/wwwroot/index.html new file mode 100644 index 0000000..929fc61 --- /dev/null +++ b/Project/Web/wwwroot/index.html @@ -0,0 +1,30 @@ + + + + + + + + + VNC 서버 목록 관리 + + + + +intro file + + \ No newline at end of file diff --git a/Project/Web/wwwroot/login.html b/Project/Web/wwwroot/login.html new file mode 100644 index 0000000..3b4dee5 --- /dev/null +++ b/Project/Web/wwwroot/login.html @@ -0,0 +1,354 @@ + + + + + + 로그인 - GroupWare + + + + + +
+ +
+ +
+
+ + + +
+

GroupWare

+

로그인하여 시스템에 접속하세요

+
+ + +
+ +
+ + +
+ + + +
+
+ + +
+ + +
+ + + +
+
+ + + +
+ + +
+
+ + 비밀번호 찾기 +
+
+ + +
+ + +
+

+ © 2024 GroupWare System. All rights reserved. +

+
+ + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/Project/fMain.cs b/Project/fMain.cs index 6598e02..c3ecec2 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -18,7 +18,8 @@ namespace Project { string SearchKey = string.Empty; ServiceHost host; - + private IDisposable webApp; + bool webok = false; public fMain() @@ -79,6 +80,7 @@ namespace Project private void __Closing(object sender, FormClosingEventArgs e) { + webApp?.Dispose(); MessageWindow.CloseAll(); if (closeforce == false) { @@ -148,47 +150,37 @@ namespace Project tmDisplay.Start(); //display timer - Func_Login(); - - Update_Site(); - UpdateControls(); - - //사용기록추적 - Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion); - // Start OWIN host try { - - WebApp.Start(url: "http://127.0.0.1:9000"); + var options = new StartOptions("http://127.0.0.1:9000"); + webApp = WebApp.Start(options); Console.WriteLine("start webapp"); Pub.log.AddI("웹지원 서버 준비 완료"); + webok = true; } catch (Exception ex) { //Util.MsgE("Web Interface Error\r\n" + ex.Message)/; Console.WriteLine(ex.Message); Pub.log.AddE("웹지원오류" + ex.Message); + webok = false; } + Func_Login(); - //// Address - //string address = "net.tcp://localhost:57900/eetgw"; + ///즐겨찾기 목록 갱신 + Update_FavoriteSite(); - //// Binding : TCP 사용 - //NetTcpBinding binding = new NetTcpBinding(); + UpdateControls(); - //// Service Host 만들기 - //host = new ServiceHost(typeof(MyService)); + //사용기록추적 + Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion); - //// End Point 추가 - //host.AddServiceEndpoint(typeof(IMyContract), binding, address); - - //// Service Host 시작 - //host.Open(); } - void Update_Site() + + void Update_FavoriteSite() { //즐겨찾기 없데이트 g=17 //타입 @@ -212,9 +204,19 @@ namespace Project void Func_Login() { - using (Dialog.fLogin flogIn = new Dialog.fLogin()) - if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK) - Application.ExitThread(); + if (this.webok) + { + using (var flogIn = new Dialog.fLogin_WB()) + if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK) + Application.ExitThread(); + } + else + { + using (var flogIn = new Dialog.fLogin()) + if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK) + Application.ExitThread(); + } + this.mn_purchase.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase); this.mn_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);