Skip to content

Commit

Permalink
Merge branch 'release/temp_release'
Browse files Browse the repository at this point in the history
  • Loading branch information
shockzinfinity committed Jun 13, 2017
2 parents 5afe7c3 + 7b4e76b commit 35f9e1a
Show file tree
Hide file tree
Showing 48 changed files with 1,098 additions and 243 deletions.
2 changes: 1 addition & 1 deletion sapHowmuch.Base.TestConsole/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private static void Main(string[] args)
SapStream.ItemEventStream.Subscribe(ev =>
{
Console.WriteLine($"[ItemEvent] {ev.EventFiredTime.ToString("yyyy-MM-dd HH:mm:ss.fff")}");
Console.WriteLine($"{ev.FormUid}, {ev.DetailArg.FormTypeEx}, {ev.DetailArg.ItemUID}, {ev.DetailArg.ColUID}");
Console.WriteLine($"{ev.DetailArg.FormUID}, {ev.DetailArg.FormTypeEx}, {ev.DetailArg.ItemUID}, {ev.DetailArg.ColUID}");
Console.WriteLine($"Mode: {ev.DetailArg.FormMode}");
Console.WriteLine($"EventType: {ev.DetailArg.EventType} // {ev.DetailArg.BeforeAction} // {ev.DetailArg.ActionSuccess}");
Console.WriteLine($"ItemChanged: {ev.DetailArg.ItemChanged}");
Expand Down
14 changes: 7 additions & 7 deletions sapHowmuch.Base.TestConsole/packages.config
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="4.6.0" targetFramework="net461" />
<package id="System.Reactive" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net461" />
<package id="Autofac" version="4.6.0" targetFramework="net461" />
<package id="System.Reactive" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net461" />
<package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net461" />
</packages>
13 changes: 12 additions & 1 deletion sapHowmuch.Base.TestWinform/App.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
</configSections>
<appSettings>
<add key="IsTraceSapEvent" value="true" />
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<nlog>
<include file="${basedir}/NLog.config" />
</nlog>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
96 changes: 96 additions & 0 deletions sapHowmuch.Base.TestWinform/Controllers/MK0001Controller.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
using sapHowmuch.Base.Attributes;
using sapHowmuch.Base.Enums;
using sapHowmuch.Base.Extensions;
using sapHowmuch.Base.Forms;
using sapHowmuch.Base.Helpers;

namespace sapHowmuch.Base.TestWinform.Controllers
{
internal class MK0001Controller : FormController
{
#region general form settings

public override bool Unique => false;

#endregion general form settings

protected override void OnFormCreate()
{
// 초기화 로직

using (Form.FreezeEx())
{
Form.VisibleEx = true;
}
sapHowmuchLogger.Trace($"{this.Form.Title} // UID: {this.UniqueId} // [{this.FormResource}]");
}

#region derived class dispose implementation

private bool _disposed = false;

protected override void Dispose(bool disposing)
{
if (_disposed) return;

if (disposing)
{
// free any other managed objects here.
}

// free any unmanaged objects here.

sapHowmuchLogger.Debug($"{GetType().Name} Dispose is called.");

_disposed = true;

base.Dispose(disposing);
}

~MK0001Controller()
{
sapHowmuchLogger.Debug($"{GetType().Name} Destruct method is called.");
Dispose(false);
}

#endregion derived class dispose implementation

#region control placeholders

// TODO: code snippet 으로 변경 필요
[SrfControl("Item_27", SrfControlType.EditText)]
private SAPbouiCOM.EditText _txtFrom;

[SrfControl("Item_28", SrfControlType.EditText)]
private SAPbouiCOM.EditText _txtTo;

[SrfControl("Item_2", SrfControlType.EditText)]
private SAPbouiCOM.EditText _txtFACode;

[SrfControl("Item_8", SrfControlType.EditText)]
private SAPbouiCOM.EditText _txtFAName;

[SrfControl("Item_12", SrfControlType.ComboBox)]
private SAPbouiCOM.ComboBox _cmbExpense;

[SrfControl("Item_30", SrfControlType.EditText)]
private SAPbouiCOM.EditText _txtAcctCode;

[SrfControl("Item_31", SrfControlType.EditText)]
private SAPbouiCOM.EditText _txtAcctName;

[SrfControl("Item_18", SrfControlType.Button)]
private SAPbouiCOM.Button _btnSearch;

[SrfControl("2", SrfControlType.Button)]
private SAPbouiCOM.Button _btnCancel;

[SrfControl("Item_1", SrfControlType.Matrix)]
private SAPbouiCOM.Matrix _matSummary;

[SrfControl("Item_4", SrfControlType.Matrix)]
private SAPbouiCOM.Matrix _matDetail;

#endregion control placeholders
}
}
38 changes: 33 additions & 5 deletions sapHowmuch.Base.TestWinform/Controllers/TestFormController.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
using sapHowmuch.Base.Constants;
using sapHowmuch.Base.Extensions;
using sapHowmuch.Base.Extensions;
using sapHowmuch.Base.Forms;
using System;
using System.Collections.Generic;
using sapHowmuch.Base.Helpers;

namespace sapHowmuch.Base.TestWinform.Controllers
{
public class TestFormController : FormController
{
protected override void FormCreated()
protected override void OnFormCreate()
{
var comboboxItem = Form.Items.Add("comboT01", SAPbouiCOM.BoFormItemTypes.it_COMBO_BOX);
comboboxItem.Visible = true;
Expand All @@ -24,5 +22,35 @@ protected override void FormCreated()
}

public override bool Unique => true;

#region derived class dispose implementation

private bool _disposed = false;

protected override void Dispose(bool disposing)
{
if (_disposed) return;

if (disposing)
{
// free any other managed objects here.
}

// free any unmanaged objects here.

sapHowmuchLogger.Debug($"{GetType().Name} Dispose is called.");

_disposed = true;

base.Dispose(disposing);
}

~TestFormController()
{
sapHowmuchLogger.Debug($"{GetType().Name} Destruct method is called.");
Dispose(false);
}

#endregion derived class dispose implementation
}
}
51 changes: 47 additions & 4 deletions sapHowmuch.Base.TestWinform/Controllers/VT0010Controller.cs
Original file line number Diff line number Diff line change
@@ -1,21 +1,64 @@
using sapHowmuch.Base.Extensions;
using sapHowmuch.Base.Forms;
using sapHowmuch.Base.Helpers;
using System;
using System.Diagnostics;
using System.Reactive.Linq;

namespace sapHowmuch.Base.TestWinform.Controllers
{
public class VT0010Controller : FormController
{
public VT0010Controller() : base(true)
protected override void OnFormCreate()
{
using (Form.FreezeEx())
{
SubscribeTest();
Form.VisibleEx = true;
}
}

private void SubscribeTest()
{
ItemEventStream.Subscribe(ev =>
{
Debug.WriteLine($"EventType: {ev.DetailArg.EventType.ToString()}");
Debug.WriteLine($"FiredTime: {ev.EventFiredTime.ToString("yyyy-MM-dd HH:mm:ss.fff")}");
Debug.WriteLine($"Form UniqueId: {ev.DetailArg.FormUID}");
Debug.WriteLine($"FormTypeEx: {ev.DetailArg.FormTypeEx}");
Debug.WriteLine($"Item UniqueId: {ev.DetailArg.ItemUID}");
Debug.WriteLine(Environment.NewLine);
});
}

protected override void FormCreated()
#region derived class dispose implementation

private bool _disposed = false;

protected override void Dispose(bool disposing)
{
using (Form.FreezeEx())
if (_disposed) return;

if (disposing)
{
Form.VisibleEx = true;
// free any other managed objects here.
}

// free any unmanaged objects here.

sapHowmuchLogger.Debug($"{GetType().Name} Dispose is called.");

_disposed = true;

base.Dispose(disposing);
}

~VT0010Controller()
{
sapHowmuchLogger.Debug($"{GetType().Name} Destruct method is called.");
Dispose(false);
}

#endregion derived class dispose implementation
}
}
33 changes: 32 additions & 1 deletion sapHowmuch.Base.TestWinform/Controllers/VT0021Controller.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using sapHowmuch.Base.Extensions;
using sapHowmuch.Base.Forms;
using sapHowmuch.Base.Helpers;

namespace sapHowmuch.Base.TestWinform.Controllers
{
public class VT0021Controller : FormController
{
protected override void FormCreated()
protected override void OnFormCreate()
{
using (Form.FreezeEx())
{
Expand All @@ -14,5 +15,35 @@ protected override void FormCreated()
}

public override bool Unique => true;

#region derived class dispose implementation

private bool _disposed = false;

protected override void Dispose(bool disposing)
{
if (_disposed) return;

if (disposing)
{
// free any other managed objects here.
}

// free any unmanaged objects here.

sapHowmuchLogger.Debug($"{GetType().Name} Dispose is called.");

_disposed = true;

base.Dispose(disposing);
}

~VT0021Controller()
{
sapHowmuchLogger.Debug($"{GetType().Name} Destruct method is called.");
Dispose(false);
}

#endregion derived class dispose implementation
}
}
Loading

0 comments on commit 35f9e1a

Please sign in to comment.