개정판 082cbc54
markus link 추가
Change-Id: Ic3e6b96a1fe6616e51d666f1d50dcb7cdb1d2d31
| ConvertService/ServiceBase/IServiceBase/ConvertItem.cs | ||
|---|---|---|
| 147 | 147 |
string _GroupName; |
| 148 | 148 |
string _documentID; |
| 149 | 149 |
string _validation; |
| 150 |
|
|
| 150 |
string _MarkusLink; |
|
| 151 | 151 |
|
| 152 | 152 |
|
| 153 | 153 |
DateTime _createtime; |
| ... | ... | |
| 499 | 499 |
} |
| 500 | 500 |
} |
| 501 | 501 |
} |
| 502 |
|
|
| 503 |
[DataMember] |
|
| 504 |
public string MarkusLink |
|
| 505 |
{
|
|
| 506 |
get |
|
| 507 |
{
|
|
| 508 |
return _MarkusLink; |
|
| 509 |
} |
|
| 510 |
set |
|
| 511 |
{
|
|
| 512 |
if (_MarkusLink != value) |
|
| 513 |
{
|
|
| 514 |
_MarkusLink = value; |
|
| 515 |
OnPropertyChanged("MarkusLink");
|
|
| 516 |
|
|
| 517 |
} |
|
| 518 |
} |
|
| 519 |
} |
|
| 502 | 520 |
} |
| 503 | 521 |
} |
| ConvertService/ServiceBase/Markus.Service.DataBase/Data/ViewInfo.cs | ||
|---|---|---|
| 1 |
using System; |
|
| 2 |
using System.Collections.Generic; |
|
| 3 |
using System.Linq; |
|
| 4 |
using System.Text; |
|
| 5 |
using System.Threading.Tasks; |
|
| 6 |
|
|
| 7 |
namespace Markus.Service.DataBase.Data |
|
| 8 |
{
|
|
| 9 |
public class ViewInfo |
|
| 10 |
{
|
|
| 11 |
public string DocumentItemID { get; set; }
|
|
| 12 |
public bool bPartner { get; set; }
|
|
| 13 |
public bool CreateFinalPDFPermission { get; set; }
|
|
| 14 |
public bool NewCommentPermission { get; set; }
|
|
| 15 |
public string ProjectNO { get; set; }
|
|
| 16 |
public string UserID { get; set; }
|
|
| 17 |
public int Mode { get; set; }
|
|
| 18 |
|
|
| 19 |
|
|
| 20 |
/// <summary> |
|
| 21 |
/// 생성자 |
|
| 22 |
/// </summary> |
|
| 23 |
public ViewInfo() |
|
| 24 |
{
|
|
| 25 |
bPartner = false; |
|
| 26 |
CreateFinalPDFPermission = true; |
|
| 27 |
NewCommentPermission = true; |
|
| 28 |
Mode = 0; |
|
| 29 |
} |
|
| 30 |
|
|
| 31 |
} |
|
| 32 |
} |
|
| ConvertService/ServiceBase/Markus.Service.DataBase/Extentions/MarkusAPI.cs | ||
|---|---|---|
| 1 |
using Newtonsoft.Json; |
|
| 2 |
using System; |
|
| 3 |
using System.Collections.Generic; |
|
| 4 |
using System.Linq; |
|
| 5 |
using System.Text; |
|
| 6 |
using System.Threading.Tasks; |
|
| 7 |
using Markus.Service.DataBase.Data; |
|
| 8 |
|
|
| 9 |
namespace Markus.Service.DataBase.Extensions |
|
| 10 |
{
|
|
| 11 |
//// userID는 관리자 계정인 doftech |
|
| 12 |
//string markusLink = "kcom://" + MarkusAPI.CreateMarkusParam(projectNo, documentID, userID); |
|
| 13 |
public class MarkusAPI |
|
| 14 |
{
|
|
| 15 |
public static string CreateMarkusParam(string projectNo, string documentID, string userID) |
|
| 16 |
{
|
|
| 17 |
ViewInfo viewInfo = new ViewInfo(); |
|
| 18 |
|
|
| 19 |
viewInfo.DocumentItemID = documentID; |
|
| 20 |
viewInfo.ProjectNO = projectNo; |
|
| 21 |
viewInfo.UserID = userID; |
|
| 22 |
|
|
| 23 |
return ParamEncoding(JsonConvert.SerializeObject(viewInfo)); |
|
| 24 |
|
|
| 25 |
} |
|
| 26 |
|
|
| 27 |
public static string ParamEncoding(string EncodingText, System.Text.Encoding oEncoding = null) |
|
| 28 |
{
|
|
| 29 |
|
|
| 30 |
if (oEncoding == null) |
|
| 31 |
oEncoding = System.Text.Encoding.UTF8; |
|
| 32 |
|
|
| 33 |
return Convert.ToBase64String(oEncoding.GetBytes(EncodingText)); |
|
| 34 |
|
|
| 35 |
} |
|
| 36 |
} |
|
| 37 |
} |
|
| ConvertService/ServiceBase/Markus.Service.DataBase/Markus.Service.DataBase.csproj | ||
|---|---|---|
| 76 | 76 |
<Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL"> |
| 77 | 77 |
<HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath> |
| 78 | 78 |
</Reference> |
| 79 |
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> |
|
| 80 |
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> |
|
| 81 |
</Reference> |
|
| 79 | 82 |
<Reference Include="System" /> |
| 80 | 83 |
<Reference Include="System.ComponentModel.DataAnnotations" /> |
| 81 | 84 |
<Reference Include="System.Core" /> |
| ... | ... | |
| 90 | 93 |
</ItemGroup> |
| 91 | 94 |
<ItemGroup> |
| 92 | 95 |
<Compile Include="ConvertDatabase.cs" /> |
| 96 |
<Compile Include="Data\ViewInfo.cs" /> |
|
| 97 |
<Compile Include="Extentions\MarkusAPI.cs" /> |
|
| 93 | 98 |
<Compile Include="PropertiesTableDefine.cs" /> |
| 94 | 99 |
<Compile Include="Properties\AssemblyInfo.cs" /> |
| 95 | 100 |
<Compile Include="Properties\Settings.Designer.cs"> |
| ... | ... | |
| 128 | 133 |
<ItemGroup> |
| 129 | 134 |
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
|
| 130 | 135 |
</ItemGroup> |
| 136 |
<ItemGroup /> |
|
| 131 | 137 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
| 132 | 138 |
</Project> |
| ConvertService/ServiceBase/Markus.Service.DataBase/packages.config | ||
|---|---|---|
| 4 | 4 |
<package id="EntityFramework.ko" version="6.2.0" targetFramework="net45" /> |
| 5 | 5 |
<package id="Markus.Message" version="1.5.4" targetFramework="net45" /> |
| 6 | 6 |
<package id="MarkusDatabase" version="1.8.0" targetFramework="net45" developmentDependency="true" /> |
| 7 |
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" /> |
|
| 7 | 8 |
</packages> |
| ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
|---|---|---|
| 72 | 72 |
<controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
|
| 73 | 73 |
<telerik:GridViewDataColumn Header="Convert ID " |
| 74 | 74 |
DataMemberBinding="{Binding ConvertID}" MinWidth="180" MaxWidth="200" />
|
| 75 |
<telerik:GridViewDataColumn Header="MarkusLink " |
|
| 76 |
DataMemberBinding="{Binding MarkusLink}" MinWidth="180" MaxWidth="200" />
|
|
| 75 | 77 |
<telerik:GridViewDataColumn Header="ProjectNO" |
| 76 | 78 |
DataMemberBinding="{Binding ProjectNumber}" MinWidth="50" MaxWidth="70"/>
|
| 77 | 79 |
|
| ... | ... | |
| 145 | 147 |
|
| 146 | 148 |
<telerik:GridViewDataColumn Header="Convert ID " |
| 147 | 149 |
DataMemberBinding="{Binding ConvertID}" MinWidth="180" MaxWidth="200" />
|
| 150 |
<telerik:GridViewDataColumn Header="MarkusLink " |
|
| 151 |
DataMemberBinding="{Binding MarkusLink}" MinWidth="180" MaxWidth="200" />
|
|
| 148 | 152 |
<telerik:GridViewDataColumn Header="ProjectNO" |
| 149 | 153 |
DataMemberBinding="{Binding ProjectNumber}" MinWidth="50" MaxWidth="70"/>
|
| 150 | 154 |
|
내보내기 Unified diff
