warn clear
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@@ -1,8 +1,5 @@
|
||||
bin
|
||||
obj
|
||||
*.suo
|
||||
/.vs/EETGW/v15/Server/sqlite3
|
||||
/packages
|
||||
/.vs/EETGW
|
||||
/SubProject/FCOMMON/.vs
|
||||
/DBMigration/.vs/DBMigration
|
||||
.vs
|
||||
packages
|
||||
|
||||
@@ -412,7 +412,6 @@
|
||||
<Compile Include="MethodExtentions.cs" />
|
||||
<Compile Include="Web\Model\PageModel.cs" />
|
||||
<Compile Include="Web\Startup.cs" />
|
||||
<Compile Include="Web\StartupSSE.cs" />
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Settings.cs" />
|
||||
<Compile Include="SqlServerTypes\Loader.cs" />
|
||||
|
||||
@@ -99,7 +99,7 @@ namespace Project
|
||||
|
||||
InitWebView = 1;
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch
|
||||
{
|
||||
InitWebView = 2;
|
||||
}
|
||||
|
||||
@@ -1,101 +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;
|
||||
|
||||
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<bool> _tcs;
|
||||
public Subscriber(Stream body, TaskCompletionSource<bool> 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<Subscriber> _subscribers = new List<Subscriber>();
|
||||
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<Subscriber>();
|
||||
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<bool>();
|
||||
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<bool> 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";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -44,7 +44,7 @@ namespace Project._Common
|
||||
bs.Filter = filter;
|
||||
tbFind.BackColor = Color.Lime;
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch
|
||||
{
|
||||
bs.Filter = "";
|
||||
tbFind.BackColor = Color.Tomato;
|
||||
|
||||
@@ -17,7 +17,6 @@ namespace Project
|
||||
public partial class fMain : fBase
|
||||
{
|
||||
string SearchKey = string.Empty;
|
||||
ServiceHost host;
|
||||
private IDisposable webApp;
|
||||
bool webok = false;
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl","ProjectFileName":"StaffLayoutCtl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"grid.cs"},{"SourceFile":"grid.Designer.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl\\bin\\Debug\\StaffLayoutCtl.dll","OutputItemRelativePath":"StaffLayoutCtl.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl\\bin\\Debug\\StaffLayoutCtl.pdb","OutputItemRelativePath":"StaffLayoutCtl.pdb"}],"CopyToOutputEntries":[]}
|
||||
{"RootPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl","ProjectFileName":"StaffLayoutCtl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"grid.cs"},{"SourceFile":"grid.Designer.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl\\bin\\Debug\\StaffLayoutCtl.dll","OutputItemRelativePath":"StaffLayoutCtl.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
|
||||
@@ -1 +1 @@
|
||||
{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE","ProjectFileName":"YARTE.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Buttons\\BoldButton.cs"},{"SourceFile":"Buttons\\CheckboxButton.cs"},{"SourceFile":"Buttons\\ForecolorButton.cs"},{"SourceFile":"Buttons\\IButton.cs"},{"SourceFile":"Buttons\\IFunctionButton.cs"},{"SourceFile":"Buttons\\IHTMLEditorButton.cs"},{"SourceFile":"Buttons\\InsertLinkedImageButton.cs"},{"SourceFile":"Buttons\\ItalicButton.cs"},{"SourceFile":"Buttons\\JustifyCenterButton.cs"},{"SourceFile":"Buttons\\JustifyLeftButton.cs"},{"SourceFile":"Buttons\\JustifyRightButton.cs"},{"SourceFile":"Buttons\\LinkButton.cs"},{"SourceFile":"Buttons\\OrderedListButton.cs"},{"SourceFile":"Buttons\\PredefinedButtonSets.cs"},{"SourceFile":"Buttons\\ReadOnlyButton.cs"},{"SourceFile":"Buttons\\UnderlineButton.cs"},{"SourceFile":"Buttons\\UnlinkButton.cs"},{"SourceFile":"Buttons\\UnorderedListButton.cs"},{"SourceFile":"CheckboxItem.cs"},{"SourceFile":"HtmlEditor.cs"},{"SourceFile":"HTMLEditor.Designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.VisualBasic.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.dll","OutputItemRelativePath":"YARTE.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.pdb","OutputItemRelativePath":"YARTE.pdb"}],"CopyToOutputEntries":[]}
|
||||
{"RootPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE","ProjectFileName":"YARTE.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Buttons\\BoldButton.cs"},{"SourceFile":"Buttons\\CheckboxButton.cs"},{"SourceFile":"Buttons\\ForecolorButton.cs"},{"SourceFile":"Buttons\\IButton.cs"},{"SourceFile":"Buttons\\IFunctionButton.cs"},{"SourceFile":"Buttons\\IHTMLEditorButton.cs"},{"SourceFile":"Buttons\\InsertLinkedImageButton.cs"},{"SourceFile":"Buttons\\ItalicButton.cs"},{"SourceFile":"Buttons\\JustifyCenterButton.cs"},{"SourceFile":"Buttons\\JustifyLeftButton.cs"},{"SourceFile":"Buttons\\JustifyRightButton.cs"},{"SourceFile":"Buttons\\LinkButton.cs"},{"SourceFile":"Buttons\\OrderedListButton.cs"},{"SourceFile":"Buttons\\PredefinedButtonSets.cs"},{"SourceFile":"Buttons\\ReadOnlyButton.cs"},{"SourceFile":"Buttons\\UnderlineButton.cs"},{"SourceFile":"Buttons\\UnlinkButton.cs"},{"SourceFile":"Buttons\\UnorderedListButton.cs"},{"SourceFile":"CheckboxItem.cs"},{"SourceFile":"HtmlEditor.cs"},{"SourceFile":"HTMLEditor.Designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.VisualBasic.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.dll","OutputItemRelativePath":"YARTE.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
|
||||
@@ -1 +1 @@
|
||||
{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl","ProjectFileName":"UMSControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cmsview.cs"},{"SourceFile":"EventArgs.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Slot.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.dll","OutputItemRelativePath":"UMSControl.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.pdb","OutputItemRelativePath":"UMSControl.pdb"}],"CopyToOutputEntries":[]}
|
||||
{"RootPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl","ProjectFileName":"UMSControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cmsview.cs"},{"SourceFile":"EventArgs.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Slot.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Data\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.dll","OutputItemRelativePath":"UMSControl.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
|
||||
File diff suppressed because one or more lines are too long
@@ -43,24 +43,7 @@ namespace FBS0000
|
||||
//데이터를 재 집계한다.
|
||||
this.dsReport.holydatasum.Clear();
|
||||
|
||||
//1월1일년차데이터는 이월로 변경한다..
|
||||
//var 이월데이터 = dsReport.holydata.Where(t => t.cate.StartsWith("이월") == false && t.cate.Contains("이월")).ToList();
|
||||
//foreach (var dr in 이월데이터)
|
||||
//{
|
||||
// var basecate = dr.cate.Split('-')[0].Trim();
|
||||
// dr.cate = basecate;
|
||||
// dr.iwol = true;
|
||||
|
||||
//}
|
||||
|
||||
|
||||
var grp_user = dsReport.holydata.GroupBy(t => t.uid).ToList();
|
||||
var sum_drday = 0.0;
|
||||
var sum_crday = 0.0;
|
||||
var sum_addday = 0.0;
|
||||
var sum_janday = 0.0;
|
||||
var sum_iwol = 0.0;
|
||||
|
||||
|
||||
foreach (var grp in grp_user)
|
||||
{
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -324,7 +324,7 @@ namespace FCM0000
|
||||
bs.Filter = filter.Replace("{0}", text);
|
||||
tbFind.BackColor = Color.Lime;
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
catch
|
||||
{
|
||||
tbFind.BackColor = Color.Tomato;
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -835,7 +835,7 @@ namespace FEQ0000
|
||||
}
|
||||
|
||||
//수집된데이터를 보내야한다.
|
||||
var idx = 0;
|
||||
//var idx = 0;
|
||||
foreach (var i in rowidxs)
|
||||
{
|
||||
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
|
||||
@@ -886,7 +886,7 @@ namespace FEQ0000
|
||||
|
||||
//수집된데이터를 보내야한다.
|
||||
|
||||
var idx = 0;
|
||||
//var idx = 0;
|
||||
foreach (var i in rowidxs)
|
||||
{
|
||||
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
|
||||
@@ -1444,7 +1444,7 @@ namespace FEQ0000
|
||||
|
||||
//수집된데이터를 보내야한다.
|
||||
List<dsPurchase.EETGW_PurchaseCRRow> rows = new List<dsPurchase.EETGW_PurchaseCRRow>();
|
||||
var idx = 0;
|
||||
// var idx = 0;
|
||||
foreach (var i in rowidxs)
|
||||
{
|
||||
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
|
||||
|
||||
@@ -1153,7 +1153,7 @@ namespace FEQ0000
|
||||
}
|
||||
|
||||
//수집된데이터를 보내야한다.
|
||||
var idx = 0;
|
||||
//var idx = 0;
|
||||
foreach (var i in rowidxs)
|
||||
{
|
||||
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
|
||||
@@ -1206,7 +1206,7 @@ namespace FEQ0000
|
||||
}
|
||||
|
||||
//수집된데이터를 보내야한다.
|
||||
var idx = 0;
|
||||
//var idx = 0;
|
||||
foreach (var i in rowidxs)
|
||||
{
|
||||
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
|
||||
|
||||
@@ -1146,7 +1146,6 @@ namespace FEQ0000
|
||||
}
|
||||
|
||||
//수집된데이터를 보내야한다.
|
||||
var idx = 0;
|
||||
foreach (var i in rowidxs)
|
||||
{
|
||||
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
|
||||
@@ -1196,8 +1195,6 @@ namespace FEQ0000
|
||||
}
|
||||
|
||||
//수집된데이터를 보내야한다.
|
||||
|
||||
var idx = 0;
|
||||
foreach (var i in rowidxs)
|
||||
{
|
||||
var rowidx = (int)fpSpread1.ActiveSheet.GetValue(i, idxcol.Index);
|
||||
|
||||
@@ -245,7 +245,7 @@ namespace FEQ0000
|
||||
book = new libxl.XmlBook();
|
||||
book.setKey(FCOMMON.info.libxlCompany, FCOMMON.info.libxlKey);
|
||||
var sheet = book.addSheet("data");
|
||||
var colno = 0;
|
||||
//var colno = 0;
|
||||
var rowno = 0;
|
||||
for (int i = 0; i < this.listView1.Columns.Count; i++)
|
||||
{
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -323,8 +323,8 @@ namespace FPJ0000.JobReport_
|
||||
//ETC영역계산
|
||||
{
|
||||
//전체합산데이터와, 2~10까지의 데이터가 일치하지 않으면 그것이 ETC이다
|
||||
var etchr = item.Where(t => t.hrs != null).Sum(t => (float)t.hrs);
|
||||
var etcot = item.Where(t => t.ot != null).Sum(t => (float)t.ot);
|
||||
var etchr = item.Sum(t => (float)t.hrs);
|
||||
var etcot = item.Sum(t => (float)t.ot);
|
||||
|
||||
//현재데이터의 hrs의 합
|
||||
var subtotal = 0f;
|
||||
|
||||
@@ -707,7 +707,6 @@
|
||||
private System.Windows.Forms.TreeView treeView1;
|
||||
private System.Windows.Forms.Button btRefreshTreeview;
|
||||
private System.Windows.Forms.Label lbWarningManager;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn svalue2DataGridViewTextBoxColumn;
|
||||
private System.Windows.Forms.GroupBox groupBox3;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private System.Windows.Forms.GroupBox groupBox4;
|
||||
|
||||
@@ -134,7 +134,7 @@ namespace FPJ0000.JobReport_
|
||||
var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs);
|
||||
|
||||
//데이터를 추가한다.
|
||||
bool addholy = false;
|
||||
//bool addholy = false;
|
||||
foreach (var dr in dsReport.JobProjectTimes.OrderByDescending(t => t.PrjStatus + t.PrjName).GroupBy(t => t.PrjName))
|
||||
{
|
||||
var pidx = dr.Key;
|
||||
@@ -151,13 +151,13 @@ namespace FPJ0000.JobReport_
|
||||
{
|
||||
row.Add("--");
|
||||
row.Add("미팅");
|
||||
addholy = true;
|
||||
//addholy = true;
|
||||
}
|
||||
else if (dr.Key == "휴가")
|
||||
{
|
||||
row.Add("--");
|
||||
row.Add("휴가");
|
||||
addholy = true;
|
||||
//addholy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -206,10 +206,7 @@ namespace FPJ0000.OtConfirm
|
||||
}
|
||||
|
||||
#endregion
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Button btOK;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Label label3;
|
||||
public System.Windows.Forms.NumericUpDown nudValuePMS;
|
||||
public System.Windows.Forms.RadioButton radAllPMS;
|
||||
public System.Windows.Forms.RadioButton radAll;
|
||||
|
||||
@@ -768,8 +768,8 @@ namespace FPJ0000
|
||||
private void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
|
||||
{
|
||||
if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
|
||||
var colr = "dvc_qtyreq";
|
||||
var col = "dvc_qty";
|
||||
// var colr = "dvc_qtyreq";
|
||||
// var col = "dvc_qty";
|
||||
//dv1.Rows[e.RowIndex].Cells[e.ColumnIndex]
|
||||
}
|
||||
|
||||
|
||||
@@ -351,35 +351,35 @@ namespace FPJ0000
|
||||
util.MsgE("프로젝트로 등록하세요. 프로젝트 정보 중 [비용절감]을 체크하세요");
|
||||
return;
|
||||
|
||||
var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow();
|
||||
newdr.wuid = FCOMMON.info.Login.no;
|
||||
newdr.wdate = DateTime.Now;
|
||||
newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
newdr.edate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
newdr.userManager = FCOMMON.info.Login.nameK;
|
||||
newdr.userprocess = FCOMMON.info.Login.process;
|
||||
newdr.costn = 0;
|
||||
newdr.costo = 0;
|
||||
newdr.cnt = 1;
|
||||
newdr.name = "Project Title";
|
||||
var f = new fSaveCostData(newdr);
|
||||
f.StartPosition = FormStartPosition.CenterScreen;
|
||||
var dlg = f.ShowDialog();
|
||||
if (dlg == System.Windows.Forms.DialogResult.OK)
|
||||
{
|
||||
this.dsMSSQL.EETGW_SaveCost.AddEETGW_SaveCostRow(newdr);
|
||||
try
|
||||
{
|
||||
//var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow();
|
||||
//newdr.wuid = FCOMMON.info.Login.no;
|
||||
//newdr.wdate = DateTime.Now;
|
||||
//newdr.pdate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
//newdr.edate = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
//newdr.userManager = FCOMMON.info.Login.nameK;
|
||||
//newdr.userprocess = FCOMMON.info.Login.process;
|
||||
//newdr.costn = 0;
|
||||
//newdr.costo = 0;
|
||||
//newdr.cnt = 1;
|
||||
//newdr.name = "Project Title";
|
||||
//var f = new fSaveCostData(newdr);
|
||||
//f.StartPosition = FormStartPosition.CenterScreen;
|
||||
//var dlg = f.ShowDialog();
|
||||
//if (dlg == System.Windows.Forms.DialogResult.OK)
|
||||
//{
|
||||
// this.dsMSSQL.EETGW_SaveCost.AddEETGW_SaveCostRow(newdr);
|
||||
// try
|
||||
// {
|
||||
|
||||
ta.Update(newdr);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
FCOMMON.Util.MsgE("Save Error\n" + ex.Message);
|
||||
}
|
||||
// ta.Update(newdr);
|
||||
// }
|
||||
// catch (Exception ex)
|
||||
// {
|
||||
// FCOMMON.Util.MsgE("Save Error\n" + ex.Message);
|
||||
// }
|
||||
|
||||
}
|
||||
else newdr.Delete();
|
||||
//}
|
||||
//else newdr.Delete();
|
||||
}
|
||||
|
||||
private void btEdit_Click(object sender, EventArgs e)
|
||||
@@ -442,13 +442,6 @@ namespace FPJ0000
|
||||
{
|
||||
util.MsgE("프로젝트로 등록하세요. 프로젝트 정보 중 [비용절감]을 체크하세요");
|
||||
return;
|
||||
|
||||
var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow();
|
||||
newdr.wuid = FCOMMON.info.Login.no;
|
||||
newdr.wdate = DateTime.Now;
|
||||
newdr.pdate = DateTime.Now.ToShortDateString();
|
||||
newdr.gcode = FCOMMON.info.Login.gcode;
|
||||
this.dsMSSQL.EETGW_SaveCost.AddEETGW_SaveCostRow(newdr);
|
||||
}
|
||||
}
|
||||
}
|
||||
1
SubProject/FPJ0000/fMailSend.Designer.cs
generated
1
SubProject/FPJ0000/fMailSend.Designer.cs
generated
@@ -832,7 +832,6 @@
|
||||
private System.Windows.Forms.TextBox textBox3;
|
||||
private dsMail dsMail;
|
||||
private dsMailTableAdapters.MailDataTableAdapter ta;
|
||||
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
|
||||
private YARTE.UI.HtmlEditor htmlEditor1;
|
||||
private System.Windows.Forms.ToolStripButton toolStripButton2;
|
||||
private System.Windows.Forms.ToolStripButton toolStripButton3;
|
||||
|
||||
Reference in New Issue
Block a user