프로젝트

일반

사용자정보

개정판 e1c892f7

IDe1c892f79fc4f24a2a0b11e27f12a5c62a9a198b
상위 c4c41461
하위 abf289f3

김태성이(가) 4년 이상 전에 추가함

- 효성 AutoStamping 서비스 추가

Change-Id: I5d001e75e3c0de5d2475641cf0f771ca541e6e40

차이점 보기:

ConvertService/ServiceController/Markus.Service.StationController/Markus.Service.StationController.csproj
105 105
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
106 106
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
107 107
    </Reference>
108
    <Reference Include="Markus.Service.WcfClient">
109
      <HintPath>..\..\ServiceBase\Markus.Service.WcfClient\bin\Debug\Markus.Service.WcfClient.dll</HintPath>
110
    </Reference>
108 111
    <Reference Include="MaterialDesignColors, Version=1.2.0.325, Culture=neutral, processorArchitecture=MSIL">
109 112
      <HintPath>..\packages\MaterialDesignColors.1.2.0\lib\net45\MaterialDesignColors.dll</HintPath>
110 113
    </Reference>
......
450 453
      <Project>{5f983789-3e8f-4f9a-a601-138c3a83ca5f}</Project>
451 454
      <Name>Markus.Service.Extensions</Name>
452 455
    </ProjectReference>
453
    <ProjectReference Include="..\Markus.Service.WcfClient\Markus.Service.WcfClient.csproj">
454
      <Project>{691078d3-be0e-4697-bab6-ed3aca842d19}</Project>
455
      <Name>Markus.Service.WcfClient</Name>
456
    </ProjectReference>
457 456
  </ItemGroup>
458 457
  <ItemGroup>
459 458
    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
ConvertService/ServiceController/Markus.Service.StationController/StationController.ini
15 15

  
16 16

  
17 17
#효성 복사본
18
MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q=
18
#$MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q=
19 19

  
20 20
#Doftech 개발
21
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
21
MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
22 22

  
23 23
# remote test MARKUS_V3
24 24
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
ConvertService/ServiceController/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
1002 1002

  
1003 1003
                                var MarkusLink = "kcom://" + CreateMarkusParam(item.ProjectNumber, item.DocumentID, "doftech");
1004 1004

  
1005
                                if (item.ConvertState != null)
1006
                                {
1007
                                    itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState);
1008
                                }
1005
                                itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState.ToString());
1009 1006

  
1010 1007
                                if (item.OriginfilePath.Contains("/"))
1011 1008
                                {
......
1024 1021
                                itemsToEach.MarkusLink = MarkusLink;
1025 1022
                                itemsToEach.UniqueKey = item.UniqueKey;
1026 1023
                                itemsToEach.GroupNo = item.GroupNo;
1027
                                itemsToEach.DocumentName = item.DocumnetName;
1024
                                itemsToEach.DocumentName = item.DocumentName;
1028 1025
                                itemsToEach.Revision = item.Revision;
1029 1026
                                itemsToEach.Exception = item.Exception;
1030 1027
                                itemsToEach.ConvertPath = item.ConvertPath;
ConvertService/ServiceController/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs
1079 1079

  
1080 1080
                                var MarkusLink = "kcom://" + CreateMarkusParam(item.ProjectNumber, item.DocumentID, "doftech");
1081 1081

  
1082
                                if (item.ConvertState != null)
1083
                                {
1084
                                    itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState);
1085
                                }
1082
                                itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState.ToString());
1086 1083

  
1087 1084
                                if (item.OriginfilePath.Contains("/"))
1088 1085
                                {
......
1101 1098
                                itemsToEach.MarkusLink = MarkusLink;
1102 1099
                                itemsToEach.DocumentID = item.DocumentID;
1103 1100
                                itemsToEach.GroupNo = item.GroupNo;
1104
                                itemsToEach.DocumentName = item.DocumnetName;
1101
                                itemsToEach.DocumentName = item.DocumentName;
1105 1102
                                itemsToEach.Revision = item.Revision;
1106 1103
                                itemsToEach.Exception = item.Exception;
1107 1104
                                itemsToEach.ConvertPath = item.ConvertPath;
ConvertService/ServiceController/StationControllerService/Properties/PublishProfiles/FolderProfile.pubxml
12 12
    <SiteUrlToLaunchAfterPublish />
13 13
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
14 14
    <ExcludeApp_Data>True</ExcludeApp_Data>
15
    <publishUrl>E:\Publish</publishUrl>
15
    <publishUrl>D:\Temp\test</publishUrl>
16 16
    <DeleteExistingFiles>False</DeleteExistingFiles>
17 17
  </PropertyGroup>
18 18
</Project>
ConvertService/ServiceController/StationControllerService/Web.config
49 49
    </providers>
50 50
  </entityFramework>
51 51
  <connectionStrings>
52
    <!--효성 Connection String-->
52
    <!--doftech Connection String-->
53 53
    <add name="markusEntities"
54
      connectionString="metadata=res://*/MarkusModel.csdl|res://*/MarkusModel.ssdl|res://*/MarkusModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;application name=EntityFramework&quot;"
54
      connectionString="metadata=res://*/MarkusModel.csdl|res://*/MarkusModel.ssdl|res://*/MarkusModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;application name=EntityFramework&quot;"
55 55
      providerName="System.Data.EntityClient"/>
56 56
  </connectionStrings>
57 57
</configuration>
FinalService/KCOM_FinalService/ConnectionStrEncrypt/Program.cs
11 11
    {
12 12
        static void Main(string[] args)
13 13
        {
14
            ///String originalText = "data source=cloud.devdoftech.co.kr,7777;database={0};user id=doftech;password=dof1073#";
14
            if (args == null || args?.Count() == 0)
15
            {
16
                args = new[] { "-en", "data source=10.11.252.2,9875;database={0};user id=ProjectPortalDBConn;password=ProjectPortalDBConn" };
17
            }
18

  
15 19
            String key = "Doftech1073#";
16 20

  
17 21
            if ((args.Length == 2) && (args[0] == "-en"))
......
28 32
            {
29 33
                Console.WriteLine("Usage : ConnectionStrEncrypt.exe -en|-de <input string>");
30 34
            }
35

  
36
            Console.ReadLine();
31 37
        }
32 38

  
33 39
        public static string Decrypt(string textToDecrypt, string key)
KCOM.sln
54 54
EndProject
55 55
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MarkusApiSetup", "MarkusApiSetup\MarkusApiSetup.vdproj", "{8A397553-B98A-49B7-9BFE-2D61B628175D}"
56 56
EndProject
57
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KCOM_API_AutoStamping", "KCOM_API_AutoStamping\KCOM_API_AutoStamping.csproj", "{37154747-EA85-4EDE-BB48-E639D63E16A7}"
58
EndProject
57 59
Global
58 60
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
59 61
		Debug_CadExport|Any CPU = Debug_CadExport|Any CPU
......
778 780
		{8A397553-B98A-49B7-9BFE-2D61B628175D}.Release|Any CPU.ActiveCfg = Release
779 781
		{8A397553-B98A-49B7-9BFE-2D61B628175D}.Release|x64.ActiveCfg = Release
780 782
		{8A397553-B98A-49B7-9BFE-2D61B628175D}.Release|x86.ActiveCfg = Release
783
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_CadExport|Any CPU.ActiveCfg = Debug|Any CPU
784
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_CadExport|Any CPU.Build.0 = Debug|Any CPU
785
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_CadExport|x64.ActiveCfg = Debug|Any CPU
786
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_CadExport|x64.Build.0 = Debug|Any CPU
787
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_CadExport|x86.ActiveCfg = Debug|Any CPU
788
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_CadExport|x86.Build.0 = Debug|Any CPU
789
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_DevDoftech|Any CPU.ActiveCfg = Debug|Any CPU
790
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_DevDoftech|Any CPU.Build.0 = Debug|Any CPU
791
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_DevDoftech|x64.ActiveCfg = Debug|Any CPU
792
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_DevDoftech|x64.Build.0 = Debug|Any CPU
793
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_DevDoftech|x86.ActiveCfg = Debug|Any CPU
794
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_DevDoftech|x86.Build.0 = Debug|Any CPU
795
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_HyoSung|Any CPU.ActiveCfg = Debug|Any CPU
796
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_HyoSung|Any CPU.Build.0 = Debug|Any CPU
797
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_HyoSung|x64.ActiveCfg = Debug|Any CPU
798
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_HyoSung|x64.Build.0 = Debug|Any CPU
799
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_HyoSung|x86.ActiveCfg = Debug|Any CPU
800
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_HyoSung|x86.Build.0 = Debug|Any CPU
801
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_SNI|Any CPU.ActiveCfg = Debug|Any CPU
802
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_SNI|Any CPU.Build.0 = Debug|Any CPU
803
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_SNI|x64.ActiveCfg = Debug|Any CPU
804
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_SNI|x64.Build.0 = Debug|Any CPU
805
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_SNI|x86.ActiveCfg = Debug|Any CPU
806
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug_SNI|x86.Build.0 = Debug|Any CPU
807
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
808
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
809
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug|x64.ActiveCfg = Debug|Any CPU
810
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug|x64.Build.0 = Debug|Any CPU
811
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug|x86.ActiveCfg = Debug|Any CPU
812
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Debug|x86.Build.0 = Debug|Any CPU
813
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_Hyosung|Any CPU.ActiveCfg = Release|Any CPU
814
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_Hyosung|Any CPU.Build.0 = Release|Any CPU
815
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_Hyosung|x64.ActiveCfg = Release|Any CPU
816
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_Hyosung|x64.Build.0 = Release|Any CPU
817
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_Hyosung|x86.ActiveCfg = Release|Any CPU
818
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_Hyosung|x86.Build.0 = Release|Any CPU
819
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_PEMSS|Any CPU.ActiveCfg = Release|Any CPU
820
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_PEMSS|Any CPU.Build.0 = Release|Any CPU
821
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_PEMSS|x64.ActiveCfg = Release|Any CPU
822
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_PEMSS|x64.Build.0 = Release|Any CPU
823
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_PEMSS|x86.ActiveCfg = Release|Any CPU
824
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release_PEMSS|x86.Build.0 = Release|Any CPU
825
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
826
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release|Any CPU.Build.0 = Release|Any CPU
827
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release|x64.ActiveCfg = Release|Any CPU
828
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release|x64.Build.0 = Release|Any CPU
829
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release|x86.ActiveCfg = Release|Any CPU
830
		{37154747-EA85-4EDE-BB48-E639D63E16A7}.Release|x86.Build.0 = Release|Any CPU
781 831
	EndGlobalSection
782 832
	GlobalSection(SolutionProperties) = preSolution
783 833
		HideSolutionNode = FALSE
KCOM/Controls/PrintControl.xaml.cs
443 443
                    //bitmap.EndInit();
444 444

  
445 445
                        
446
                        var uri = await  App.PageStorage.GetPageUriAsync(currentPage.PAGE_NUMBER);
446
                    var uri = await  App.PageStorage.GetPageUriAsync(currentPage.PAGE_NUMBER);
447 447
                    //Image bitmap = new Image();
448 448
                    //bitmap.Stretch = Stretch.Fill;
449 449
                    //bitmap.Source = bitmapframe;
......
468 468
                        load.Page_No = PageNo;
469 469
                        load.DisplayColor = info.DisplayColor;
470 470
                        load.Markupinfoid = info.MarkupInfoID;
471
                        await load.Markup_LoadAsync(printCanvas);
471
                        var IsLoad = await load.Markup_LoadAsync(printCanvas);
472 472
                    }
473

  
474 473
                    //await Dispatcher.InvokeAsync(() => {
475 474
                    //    printCanvas.UpdateLayout();
476 475
                    //});
......
491 490
                                Export export = new Export();
492 491
                                p_img = export.Exporting(PrintView, printCanvas.Width, printCanvas.Height);
493 492
                                Printimg_List.Add(Printimg_List.Count() + 1, p_img);
494
                            });
493
                            },System.Windows.Threading.DispatcherPriority.Render);
495 494
                        //});
496 495
                    }
497 496

  
KCOM/Events/Load.cs
43 43
        }
44 44

  
45 45
        //마크업 불러오기
46
        public async Task Markup_LoadAsync(Canvas printCanvas)
46
        public async Task<bool> Markup_LoadAsync(Canvas printCanvas)
47 47
        {
48
            bool result = false;
49

  
48 50
            List<string> markupdata = new List<string>();
49 51

  
50 52
            Logger.sendReqLog("GetMarkupDataListperPage: ", App.ViewInfo.ProjectNO + "," + Markupinfoid + "," + Page_No, 1);       
......
60 62
            }
61 63

  
62 64
            foreach (string data in markupdata)
63
            {                
64
                await MarkupParser.ParseAsync(App.ViewInfo.ProjectNO, data, printCanvas, DisplayColor, "");
65
            {
66
                result = await MarkupParser.ParseAsync(App.ViewInfo.ProjectNO, data, printCanvas, DisplayColor, "");
67

  
68
                if(!result)
69
                {
70
                    break;
71
                }
65 72
            }
73

  
74
            return result;
66 75
        }
67 76
    }
68 77
}
KCOM/Extensions/MarkupVisitHelper.cs
121 121
                            positionX = Common.ViewerDataModel.Instance.ImageViewHeight + rect.X;
122 122
                            positionY = Common.ViewerDataModel.Instance.ImageViewWidth + rect.Y;
123 123
                        }
124
                        //else if (Common.ViewerDataModel.Instance.Angle == 270)
125
                        //{
126
                        //    positionX = Common.ViewerDataModel.Instance.ImageViewHeight + rect.X *4;
127
                        //    positionY = Common.ViewerDataModel.Instance.ImageViewWidth + rect.Y * 4;
128
                        //}
124 129

  
125 130
                        main.zoomAndPanControl.ContentScale = newScale;
126 131
                        main.zoomAndPanControl.ContentOffsetX = positionX;
......
144 149
                        {
145 150
                            var matrix = MatrixHelper.Rotation(Common.ViewerDataModel.Instance.Angle);
146 151
                            rect.Transform(matrix);
147

  
152
                            
148 153
                            main.zoomAndPanControl.ZoomTo(rect);
149 154
                        }
150 155
                        else
KCOM/KCOM.csproj.user
2 2
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3
  <PropertyGroup>
4 4
    <ReferencePath>C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\KCOM\x64\;C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\KCOM\x86\</ReferencePath>
5
    <ProjectView>ShowAllFiles</ProjectView>
5
    <ProjectView>ProjectFiles</ProjectView>
6 6
    <PublishUrlHistory>publish\</PublishUrlHistory>
7 7
    <InstallUrlHistory />
8 8
    <SupportUrlHistory />
......
13 13
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
14 14
  </PropertyGroup>
15 15
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
16
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMwMDAwMDYwIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIiwiTW9kZSI6MH0=/</StartArguments>
16
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjUwMDAwMDMiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2giLCJNb2RlIjowfQ==/</StartArguments>
17 17
  </PropertyGroup>
18 18
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
19 19
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
KCOM/Views/MainMenu.xaml.cs
819 819
            /// 페이지의 모든 마크업을 로드한 후 호출
820 820
            /// 좌측 마크업 list의 아이템을 클릭하는 경우 MarkupControls_USER가 0으로 나와서 추가함.
821 821
            ViewerDataModel.Instance.LoadPageMarkup();
822

  
823
            //Point startPoint = new Point(15, 15);
824

  
825
            
826
            //var markupinfo = ViewerDataModel.Instance._markupInfoList.Where(x => x.UserID == App.ViewInfo.UserID).First();
827

  
828
            ////var rect = GetRectControl(Convert.ToDouble(pageinfo.PAGE_WIDTH), Convert.ToDouble(pageinfo.PAGE_HEIGHT), markupinfo.UserID, markupinfo.MarkupInfoID, startPoint);
829

  
830
            ////var txtApproved = GetTextControl(Convert.ToDouble(pageinfo.PAGE_WIDTH), Convert.ToDouble(pageinfo.PAGE_HEIGHT), markupinfo.UserID, markupinfo.MarkupInfoID,
831
            ////                             "APPROVED",30, FontWeights.Bold, TextAlignment.Center, rect.ItemRect, 15);
832

  
833
            ////var txtCreator = GetTextControl(Convert.ToDouble(pageinfo.PAGE_WIDTH), Convert.ToDouble(pageinfo.PAGE_HEIGHT), markupinfo.UserID, markupinfo.MarkupInfoID
834
            ////                , "By HYOSUNG", 18, FontWeights.Bold, TextAlignment.Center, rect.ItemRect, txtApproved.StartPoint.Y + txtApproved.BoxHeight + 3);
835

  
836
            //var symCtrl = GetSymNControl(Convert.ToDouble(pageinfo.PAGE_WIDTH), Convert.ToDouble(pageinfo.PAGE_HEIGHT), markupinfo.UserID, markupinfo.MarkupInfoID, startPoint);
837

  
838
            //var bottom = Rect.Offset(symCtrl.ItemRect, new Vector(0, symCtrl.ItemRect.Height));
839

  
840
            //var txtOriginator = GetTextControl(Convert.ToDouble(pageinfo.PAGE_WIDTH), Convert.ToDouble(pageinfo.PAGE_HEIGHT), markupinfo.UserID, markupinfo.MarkupInfoID
841
            //               , App.ViewInfo.UserID, 18, FontWeights.Bold, TextAlignment.Left, bottom, bottom.Top + 3);
842

  
843
            //var dtfi = new System.Globalization.DateTimeFormatInfo { DateSeparator = "-", ShortDatePattern = @"yyyy/MM/dd" };
844

  
845
            //var txtDate = GetTextControl(Convert.ToDouble(pageinfo.PAGE_WIDTH), Convert.ToDouble(pageinfo.PAGE_HEIGHT), markupinfo.UserID, markupinfo.MarkupInfoID
846
            //               , DateTime.Now.ToString("d", dtfi), 18, FontWeights.Bold, TextAlignment.Left, bottom, txtOriginator.StartPoint.Y + txtOriginator.BoxHeight + 2);
847

  
848
            //ViewerDataModel.Instance.MarkupControls_USER.Add(symCtrl);
849
            ////ViewerDataModel.Instance.MarkupControls_USER.Add(txtApproved);
850
            ////ViewerDataModel.Instance.MarkupControls_USER.Add(txtCreator);
851
            //ViewerDataModel.Instance.MarkupControls_USER.Add(txtOriginator);
852
            //ViewerDataModel.Instance.MarkupControls_USER.Add(txtDate);
853

  
854
            //symCtrl.ApplyTemplate();
855
            ////txtApproved.ApplyTemplate();
856
            ////txtCreator.ApplyTemplate();
857
            //txtOriginator.ApplyTemplate();
858
            //txtDate.ApplyTemplate();
859

  
860
            ////SetTextControl(txtApproved);
861
            ////SetTextControl(txtCreator);
862
            //SetTextControl(txtOriginator);
863
            //SetTextControl(txtDate);
864

  
865
            //multi_Undo_Data = new Multi_Undo_data();
866

  
867
            //MarkupToPDF.Common.Undo_data UndoData = new Undo_data()
868
            //{
869
            //    IsUndo = false,
870
            //    Event = Event_Type.Create,
871
            //    EventTime = DateTime.Now,
872
            //    Markup_List = new List<Multi_Undo_data>()
873
            //};
874

  
875
            //multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(symCtrl as MarkupToPDF.Common.CommentUserInfo);
876
            //UndoData.Markup_List.Add(multi_Undo_Data);
877

  
878
            ////multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtApproved as MarkupToPDF.Common.CommentUserInfo);
879
            ////UndoData.Markup_List.Add(multi_Undo_Data);
880

  
881
            ////multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtCreator as MarkupToPDF.Common.CommentUserInfo);
882
            ////UndoData.Markup_List.Add(multi_Undo_Data);
883

  
884
            //multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtOriginator as MarkupToPDF.Common.CommentUserInfo);
885
            //UndoData.Markup_List.Add(multi_Undo_Data);
886

  
887
            //multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(txtDate as MarkupToPDF.Common.CommentUserInfo);
888
            //UndoData.Markup_List.Add(multi_Undo_Data);
889

  
890
            //ViewerDataModel.Instance.UndoDataList.Add(UndoData);
891

  
892
            //System.Diagnostics.Debug.WriteLine(symCtrl.GetMarkupData(App.ViewInfo.UserID, 1, markupinfo.MarkupVersionID).DATA);
893
            ////System.Diagnostics.Debug.WriteLine(txtApproved.GetMarkupData(App.ViewInfo.UserID, 1, markupinfo.MarkupVersionID).DATA);
894
            ////System.Diagnostics.Debug.WriteLine(txtCreator.GetMarkupData(App.ViewInfo.UserID, 1, markupinfo.MarkupVersionID).DATA);
895
            //System.Diagnostics.Debug.WriteLine(txtOriginator.GetMarkupData(App.ViewInfo.UserID, 1, markupinfo.MarkupVersionID).DATA);
896
            //System.Diagnostics.Debug.WriteLine(txtDate.GetMarkupData(App.ViewInfo.UserID, 1, markupinfo.MarkupVersionID).DATA);
897
        }
898

  
899
        private void SetTextControl(TextControl textControl)
900
        {
901
            textControl.Base_TextBlock.Margin = new Thickness(0, 0, 10, 0);
902
            textControl.Base_TextBox.Visibility = Visibility.Collapsed;
903
            textControl.Base_TextBlock.Visibility = Visibility.Visible;
904

  
905
        }
906

  
907
        private SymControlN GetSymNControl(double PageWidth, double PageHeight, string userId, string markupInfoId, Point startPosition)
908
        {
909
            SymControlN result = null;
910

  
911
            try
912
            {
913
                double height = 80;
914
                double itemWidth = 180;
915

  
916
                System.Windows.Point startPoint = new System.Windows.Point(startPosition.X, startPosition.Y);
917
                System.Windows.Point endPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y + height);
918
                System.Windows.Point leftBottomPoint = new System.Windows.Point(startPosition.X, startPosition.Y + height);
919
                System.Windows.Point topRightPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y);
920

  
921
                result = new SymControlN
922
                {
923
                    CommentID = Commons.shortGuid(),
924
                    MarkupInfoID = markupInfoId,
925
                    UserID = userId,
926
                    PointSet = new List<Point> { startPoint, leftBottomPoint, endPoint, topRightPoint },
927
                    StartPoint = startPoint,
928
                    EndPoint = endPoint,
929
                    CommentAngle = 0,
930
                    LeftBottomPoint = leftBottomPoint,
931
                    TopRightPoint = topRightPoint,
932
                    Opacity = 1,
933
                    PathXathData = "eJy1Ul1PwjAU/SvN9c3EdY5g1FAShyIxRgygxsemu7AbupZ0Vae/3g42/Azxxfuw9Z7Tnpx72t6lo4zdyAIFyHUBqwptSgG596tTzkuVYyHLqCDlbGnnPlK24C9k5hVP4viIV7LQfOWwROOlJ2ug36tVo1Sq5cLZJ5P1e1OrKRtYbV3qnsqcrZcC9oZNARuvpCL/KiCODoHxfo//EJmg8tIsNLKpd+hVLmBIWkPd2iU2cnGoFprlpJYGyzBOt8WuyeCVJSNgUstCM/1WHNgDZT5oJ3E4M0Ja5F7A8QmwgTTPIYlrnAfgIIm6W2hmVy3CN9M3GUzsyznOyVAdTBlG+NxvxffXx37nOlF3Fx3vppNd5P6nnL8bnWHlU23VktUrAWe3t5Px/cU5sKE1/qFRuKi8k6nV2Qae0ltIshPXncPNtX25lZF19BY2Sn2maWGK8GQEDMIXHbB7dJ7Ur1RrUcDmbXx3l76y0eN4endz+Qd/yX/663xk2v7eAQ==",
934
                    Memo = null
935
                };
936

  
937
            }
938
            catch (Exception ex)
939
            {
940
                System.Diagnostics.Debug.WriteLine(ex.ToString());
941
            }
942

  
943
            return result;
944
        }
945

  
946
        private RectangleControl GetRectControl(double PageWidth, double PageHeight, string userId,string markupInfoId, Point startPosition)
947
        {
948
            RectangleControl result = null;
949

  
950
            try
951
            {
952
                double height = 80;
953
                double itemWidth = 180;
954

  
955
                System.Windows.Point startPoint = new System.Windows.Point(startPosition.X, startPosition.Y);
956
                System.Windows.Point endPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y + height);
957
                System.Windows.Point leftBottomPoint = new System.Windows.Point(startPosition.X, startPosition.Y + height);
958
                System.Windows.Point topRightPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y);
959

  
960
                result = new RectangleControl
961
                {
962
                    CommentID = Commons.shortGuid(),
963
                    MarkupInfoID = markupInfoId,
964
                    LineSize = 5,
965
                    Paint = MarkupToPDF.Controls.Common.PaintSet.None,
966
                    StartPoint = startPoint,
967
                    EndPoint = endPoint,
968
                    CommentAngle = 0,
969
                    StrokeColor = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 0x0, 0x0)),
970
                    //StrokeColor = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 64, 224, 208)),
971
                    FillColor = null,
972
                    DashSize = new System.Windows.Media.DoubleCollection(new[] { 999999.0 }),
973
                    Opacity = 1,
974
                    LeftBottomPoint = leftBottomPoint,
975
                    TopRightPoint = topRightPoint,
976
                    PointSet = new List<Point> { startPoint,leftBottomPoint,endPoint,topRightPoint },
977
                    UserID = userId,
978
                    Memo = null
979
                };
980

  
981
            }
982
            catch (Exception ex)
983
            {
984
                System.Diagnostics.Debug.WriteLine(ex.ToString());
985
            }
986

  
987
            return result;
988
        }
989

  
990

  
991

  
992
        private TextControl GetTextControl(double PageWidth, double PageHeight, string userId, string markupInfoId, string Text,double fontSize, FontWeight fontWeight,TextAlignment textAlignment, Rect parentRect,double positionY)
993
        {
994
            TextControl result = null;
995

  
996
            try
997
            {
998

  
999
                var txtSize = ShapeMeasure(new TextBlock { Text = Text, FontSize = fontSize, FontWeight = fontWeight,FontFamily = new FontFamily("Tahoma") });
1000

  
1001
                double startPositionX = parentRect.X;
1002

  
1003
                switch (textAlignment)
1004
                {
1005
                    case TextAlignment.Right:
1006
                        startPositionX = parentRect.X + parentRect.Width - txtSize.Width;
1007
                        break;
1008
                    case TextAlignment.Center:
1009
                        startPositionX = parentRect.X + parentRect.Width / 2 - txtSize.Width / 2 - 3;
1010
                        break;
1011
                }
1012

  
1013
                Point startPosition = new Point
1014
                {
1015
                    X = startPositionX,
1016
                    Y = positionY
1017
                };
1018
                
1019
                System.Windows.Point startPoint = new System.Windows.Point(startPosition.X, startPosition.Y);
1020
                System.Windows.Point endPoint = new System.Windows.Point(startPosition.X + txtSize.Width, startPosition.Y + txtSize.Height);
1021
                System.Windows.Point leftBottomPoint = new System.Windows.Point(startPosition.X, startPosition.Y + txtSize.Height);
1022
                System.Windows.Point topRightPoint = new System.Windows.Point(startPosition.X + txtSize.Width, startPosition.Y);
1023

  
1024
                result = new TextControl
1025
                {
1026
                    CommentID = Commons.shortGuid(),
1027
                    MarkupInfoID = markupInfoId,
1028
                    Text = Text,
1029
                    StartPoint = startPoint,
1030
                    EndPoint = endPoint,
1031
                    CanvasX = startPosition.X,
1032
                    CanvasY = startPosition.Y,
1033
                    BoxWidth = txtSize.Width,
1034
                    BoxHeight = txtSize.Height,
1035
                    ControlType_No = 0,
1036
                    LineSize = new Thickness(5),
1037
                    TextSize = fontSize,
1038
                    Foreground = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 0, 0)),
1039
                    FontSize = 10,
1040
                    UserID = userId,
1041
                    IsHighLight = false,
1042
                    CommentAngle = 0,
1043
                    PointSet = new List<Point>(),
1044
                    Opacity = 1,
1045
                    IsSelected = false,
1046
                    TextFamily = new FontFamily("Tahoma"),
1047
                    TextStyle = FontStyles.Normal,
1048
                    TextWeight = FontWeights.Bold
1049
                };
1050
          
1051
            }
1052
            catch (Exception ex)
1053
            {
1054

  
1055
            }
1056

  
1057
            return result;
1058
        }
1059
        public static Size ShapeMeasure(UIElement e)
1060
        {
1061
            // Measured Size is bounded to be less than maxSize
1062
            Size maxSize = new Size(
1063
                 double.PositiveInfinity,
1064
                 double.PositiveInfinity);
1065
            e.Measure(maxSize);
1066
            return e.DesiredSize;
822 1067
        }
823 1068

  
824 1069
        private async Task MarkupLoadAsync(int pageNumber)
KCOM/app.config
183 183
      </basicHttpBinding>
184 184
    </bindings>
185 185
    <client>
186
      <endpoint address="http://localhost:8080/ServiceDeepView.svc"
187
        binding="basicHttpBinding" bindingConfiguration="DeepViewPoint1"
188
        contract="KcomService.ServiceDeepView" name="DeepViewPoint1" />
189
      <endpoint address="http://localhost:8080/ServiceDeepView.svc"
190
        binding="basicHttpBinding" bindingConfiguration="DeepViewPoint"
191
        contract="ServiceDeepView.ServiceDeepView" name="DeepViewPoint" />
186
      <endpoint address="http://localhost:8080/ServiceDeepView.svc" binding="basicHttpBinding" bindingConfiguration="DeepViewPoint1" contract="KcomService.ServiceDeepView" name="DeepViewPoint1" />
187
      <endpoint address="http://localhost:8080/ServiceDeepView.svc" binding="basicHttpBinding" bindingConfiguration="DeepViewPoint" contract="ServiceDeepView.ServiceDeepView" name="DeepViewPoint" />
192 188
    </client>
193 189
  </system.serviceModel>
194 190
  <applicationSettings>
KCOMDataModel/App.Debug.Config
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4
</configuration>
KCOMDataModel/App.Debug_CadExport.Config
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4
</configuration>
KCOMDataModel/App.Debug_HyoSung.Config
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4
  <connectionStrings  xdt:Transform="Replace">
5
    <add name="KCOMEntities"
6
     connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;application name=EntityFramework&quot;"
7
     providerName="System.Data.EntityClient" />
8
    <add name="CIEntities"
9
         connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2;initial catalog=markus;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;MultipleActiveResultSets=True;App=EntityFramework&quot;"
10
         providerName="System.Data.EntityClient" />
11
  </connectionStrings>
12
  <applicationSettings  xdt:Transform="Replace">
13
    <KCOMDataModel.Properties.Settings>
14
      <setting name="ProjectConnectionString" serializeAs="String">
15
        <value>data source=10.11.252.2;database={0};user id=ProjectPortalDBConn;password=ProjectPortalDBConn</value>
16
      </setting>
17
    </KCOMDataModel.Properties.Settings>
18
  </applicationSettings>
19
</configuration>
KCOMDataModel/App.Debug_SNI.Config
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4
</configuration>
KCOMDataModel/App.Release.Config
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4
</configuration>
KCOMDataModel/App.Release_Hyosung.Config
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4
  <connectionStrings  xdt:Transform="Replace">
5
    <add name="KCOMEntities"
6
     connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;application name=EntityFramework&quot;"
7
     providerName="System.Data.EntityClient" />
8
    <add name="CIEntities"
9
         connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2;initial catalog=markus;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;MultipleActiveResultSets=True;App=EntityFramework&quot;"
10
         providerName="System.Data.EntityClient" />
11
  </connectionStrings>
12
  <applicationSettings  xdt:Transform="Replace">
13
    <KCOMDataModel.Properties.Settings>
14
      <setting name="ProjectConnectionString" serializeAs="String">
15
        <value>data source=10.11.252.2;database={0};user id=ProjectPortalDBConn;password=ProjectPortalDBConn</value>
16
      </setting>
17
    </KCOMDataModel.Properties.Settings>
18
  </applicationSettings>
19
</configuration>
KCOMDataModel/App.Release_PEMSS.Config
1
<?xml version="1.0" encoding="utf-8"?>
2
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
3
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
4
</configuration>
KCOMDataModel/KCOMDataModel.csproj
12 12
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13 13
    <FileAlignment>512</FileAlignment>
14 14
    <TargetFrameworkProfile />
15
    <NuGetPackageImportStamp>
16
    </NuGetPackageImportStamp>
15 17
  </PropertyGroup>
16 18
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17 19
    <DebugSymbols>true</DebugSymbols>
......
185 187
  <ItemGroup>
186 188
    <None Include="App.Config">
187 189
      <SubType>Designer</SubType>
190
      <TransformOnBuild>true</TransformOnBuild>
188 191
    </None>
189 192
    <EntityDeploy Include="DataModel\CIModel.edmx">
190 193
      <Generator>EntityModelCodeGenerator</Generator>
191 194
      <LastGenOutput>CIModel.Designer.cs</LastGenOutput>
192 195
    </EntityDeploy>
196
    <None Include="App.Debug.Config">
197
      <DependentUpon>App.Config</DependentUpon>
198
      <IsTransformFile>true</IsTransformFile>
199
    </None>
200
    <None Include="App.Debug_CadExport.Config">
201
      <DependentUpon>App.Config</DependentUpon>
202
      <IsTransformFile>true</IsTransformFile>
203
    </None>
204
    <None Include="App.Debug_HyoSung.Config">
205
      <DependentUpon>App.Config</DependentUpon>
206
      <IsTransformFile>true</IsTransformFile>
207
    </None>
208
    <None Include="App.Debug_SNI.Config">
209
      <DependentUpon>App.Config</DependentUpon>
210
      <IsTransformFile>true</IsTransformFile>
211
    </None>
212
    <None Include="App.Release.Config">
213
      <DependentUpon>App.Config</DependentUpon>
214
      <IsTransformFile>true</IsTransformFile>
215
    </None>
216
    <None Include="App.Release_Hyosung.Config">
217
      <DependentUpon>App.Config</DependentUpon>
218
      <IsTransformFile>true</IsTransformFile>
219
    </None>
220
    <None Include="App.Release_PEMSS.Config">
221
      <DependentUpon>App.Config</DependentUpon>
222
      <IsTransformFile>true</IsTransformFile>
223
    </None>
193 224
    <None Include="packages.config">
194 225
      <SubType>Designer</SubType>
195 226
    </None>
......
208 239
    </ProjectReference>
209 240
  </ItemGroup>
210 241
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
242
  <Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
243
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
244
    <PropertyGroup>
245
      <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
246
    </PropertyGroup>
247
    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
248
  </Target>
211 249
</Project>
KCOMDataModel/packages.config
2 2
<packages>
3 3
  <package id="EntityFramework" version="5.0.0" targetFramework="net40" requireReinstallation="true" />
4 4
  <package id="EntityFramework.ko" version="5.0.0" targetFramework="net40" requireReinstallation="true" />
5
  <package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net461" developmentDependency="true" />
5 6
</packages>
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user
10 10
  </PropertyGroup>
11 11
  <ItemGroup>
12 12
    <File Include="bin/CommonLib.dll">
13
      <publishTime>03/19/2020 10:34:18</publishTime>
13
      <publishTime>05/26/2020 14:56:53</publishTime>
14 14
    </File>
15 15
    <File Include="bin/CommonLib.pdb">
16
      <publishTime>03/19/2020 10:34:18</publishTime>
16
      <publishTime>05/26/2020 14:56:53</publishTime>
17 17
    </File>
18 18
    <File Include="bin/CompareLib.dll">
19 19
      <publishTime>03/27/2018 10:07:16</publishTime>
......
52 52
      <publishTime>09/19/2015 15:28:04</publishTime>
53 53
    </File>
54 54
    <File Include="bin/IFinalPDF.dll">
55
      <publishTime>03/19/2020 10:34:18</publishTime>
55
      <publishTime>05/26/2020 14:56:53</publishTime>
56 56
    </File>
57 57
    <File Include="bin/IFinalPDF.pdb">
58
      <publishTime>03/19/2020 10:34:18</publishTime>
58
      <publishTime>05/26/2020 14:56:53</publishTime>
59 59
    </File>
60 60
    <File Include="bin/IKCOM.dll">
61
      <publishTime>03/19/2020 10:34:23</publishTime>
61
      <publishTime>05/26/2020 14:56:56</publishTime>
62 62
    </File>
63 63
    <File Include="bin/IKCOM.pdb">
64
      <publishTime>03/19/2020 10:34:23</publishTime>
64
      <publishTime>05/26/2020 14:56:56</publishTime>
65 65
    </File>
66 66
    <File Include="bin/it/ZedGraph.resources.dll">
67 67
      <publishTime>09/19/2015 15:28:04</publishTime>
......
70 70
      <publishTime>09/19/2015 15:28:04</publishTime>
71 71
    </File>
72 72
    <File Include="bin/KCOMDataModel.dll">
73
      <publishTime>03/19/2020 10:34:19</publishTime>
73
      <publishTime>05/26/2020 14:56:53</publishTime>
74 74
    </File>
75 75
    <File Include="bin/KCOMDataModel.dll.config">
76 76
      <publishTime>07/10/2019 14:11:36</publishTime>
77 77
    </File>
78 78
    <File Include="bin/KCOMDataModel.pdb">
79
      <publishTime>03/19/2020 10:34:19</publishTime>
79
      <publishTime>05/26/2020 14:56:53</publishTime>
80 80
    </File>
81 81
    <File Include="bin/KCOM_API.dll">
82
      <publishTime>03/19/2020 10:34:58</publishTime>
82
      <publishTime>05/26/2020 14:56:56</publishTime>
83 83
    </File>
84 84
    <File Include="bin/KCOM_API.pdb">
85
      <publishTime>03/19/2020 10:34:58</publishTime>
85
      <publishTime>05/26/2020 14:56:56</publishTime>
86 86
    </File>
87 87
    <File Include="bin/Leadtools.Codecs.Cmp.dll">
88 88
      <publishTime>06/29/2017 11:38:22</publishTime>
......
175 175
      <publishTime>09/19/2015 15:28:04</publishTime>
176 176
    </File>
177 177
    <File Include="Default.aspx">
178
      <publishTime>01/31/2020 10:04:50</publishTime>
178
      <publishTime>05/26/2020 14:55:41</publishTime>
179 179
    </File>
180 180
    <File Include="HtmlPage1.html">
181
      <publishTime>01/15/2020 14:08:02</publishTime>
181
      <publishTime>05/26/2020 14:55:41</publishTime>
182 182
    </File>
183 183
    <File Include="License-LGPL.txt">
184 184
      <publishTime>01/07/2020 16:16:11</publishTime>
......
190 190
      <publishTime>07/10/2019 14:11:36</publishTime>
191 191
    </File>
192 192
    <File Include="Web.config">
193
      <publishTime>03/19/2020 10:34:58</publishTime>
193
      <publishTime>05/26/2020 14:56:57</publishTime>
194 194
    </File>
195 195
  </ItemGroup>
196 196
</Project>
KCOM_API/ServiceDeepView.svc.cs
28 28
    {
29 29
        public ServiceDeepView()
30 30
        {
31
            System.Diagnostics.Debug.WriteLine(OperationContext.Current.RequestContext.RequestMessage.Headers.Action.ToString());
31
            //System.Diagnostics.Debug.WriteLine(OperationContext.Current.RequestContext.RequestMessage.Headers.Action.ToString());
32 32
        }
33 33

  
34 34
        /// <summary>
......
123 123
        }
124 124

  
125 125
        private static string shortGuid()
126
        {
126
        { 
127 127
            byte[] bytes = new byte[16];
128 128
            using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create())
129 129
            {
KCOM_API_AutoStamping/AutoApproval.aspx
1
<%@ Page Language="C#" AutoEventWireup="true" CodeFile="AutoApproval.aspx.cs" Inherits="AutoApproval" %>
2

  
3

  
4
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
5
<html xmlns="http://www.w3.org/1999/xhtml">
6
<head runat="server">
7
    <title>All Approval Page</title>
8
    <script type="text/javascript" >
9
     
10
    </script>
11
</head>
12
<body>
13
    <form id="form1" runat="server">
14
    
15
        <div>
16
        <table>
17
        <tr>
18
        <td>Project No :</td>
19
        <td>
20
        <asp:TextBox ID="txtproject_no" runat="server"></asp:TextBox>
21
        </td>
22
        </tr>
23
        <tr>
24
        <td>Slip No :</td>
25
        <td>
26
        <asp:TextBox ID="txtslip_no" runat="server"></asp:TextBox>
27
        </td>
28
        </tr>
29
        <tr>
30
        <td>User ID :</td>
31
        <td>
32
        <asp:TextBox ID="txtuser_id" runat="server"></asp:TextBox>
33
        </td>
34
        </tr>
35
        
36
        </table>
37
            
38
        </div>
39
        <p>
40
            
41
           <asp:Button ID="Button1" runat="server" Text="All Approval" 
42
                onclick="Button1_Click" /> 
43
            
44
        </p>
45
    </form>
46
</body>
47
</html>
KCOM_API_AutoStamping/AutoApproval.aspx.cs
1
using System;
2
using System.Data;
3
using System.Configuration;
4
using System.Web;
5
using System.Web.Security;
6
using System.Web.UI;
7
using System.Web.UI.WebControls;
8
using System.Web.UI.WebControls.WebParts;
9
using System.Web.UI.HtmlControls;
10

  
11
//using Microsoft.SharePoint;
12

  
13
using System.Net;
14
using System.Xml;
15

  
16
public partial class AutoApproval : System.Web.UI.Page 
17
{
18
    protected void Page_Load(object sender, EventArgs e)
19
    {
20
    }
21

  
22
    protected void Button1_Click(object sender, EventArgs e)
23
    {
24
        string project_no = this.txtproject_no.Text.Trim().ToString();
25
        string slip_no = this.txtslip_no.Text.Trim().ToString();
26
        string user_id = this.txtuser_id.Text.Trim().ToString();
27

  
28
        WebClient client = new WebClient();
29
        string reqstr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">"
30
                        + "<soapenv:Header/>"
31
                        + "<soapenv:Body>"
32
                        + "<AutoStamping>"
33
                        + "<project_no>" + project_no + "</project_no>"
34
                        + "<slip_no>" + slip_no + "</slip_no>"
35
                        + "<user_id>" + user_id + "</user_id>"
36
                        + "</AutoStamping>"
37
                        + "</soapenv:Body>"
38
                        + "</soapenv:Envelope>";
39
        client.Headers.Add(HttpRequestHeader.ContentType, "text/xml");
40
        client.Headers.Add("SOAPAction", "urn:ServiceDeepView/AutoStamping");
41

  
42
        string _result = client.UploadString(new Uri("http://10.11.252.3/ServiceDeepView.svc"), reqstr);
43
        XmlTextReader reader = new XmlTextReader(new System.IO.StringReader(_result));
44
        string msg = "Success";
45

  
46
        while (reader.Read())
47
        {
48
            switch (reader.NodeType)
49
            {
50
                case XmlNodeType.Element:
51
                    if (reader.Name == "AutoStampingResult")
52
                    {
53
                        reader.Read();
54
                        if (!string.IsNullOrEmpty(reader.Value))
55
                            msg = "Error:"+reader.Value;
56
                    }
57
                    break;
58
            }
59
        }
60

  
61
        Response.Write("<script language='Javascript'> ");
62
        Response.Write("alert('" + msg + "'); ");
63
        Response.Write("</script>");
64
    }
65
}
KCOM_API_AutoStamping/AutoApprovalTest.aspx
1
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AutoApprovalTest.aspx.cs" Inherits="KCOM_API_AutoStamping.AutoApprovalTest" %>
2

  
3

  
4
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
5
<html xmlns="http://www.w3.org/1999/xhtml">
6
<head runat="server">
7
    <title>All Approval Page</title>
8
    <script type="text/javascript" >
9
     
10
    </script>
11
</head>
12
<body>
13
    <form id="form1" runat="server">
14
    
15
        <div>
16
        <table>
17
        <tr>
18
        <td>Project No :</td>
19
        <td>
20
        <asp:TextBox ID="txtproject_no" runat="server"></asp:TextBox>
21
        </td>
22
         <td>
23
             <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server"   
24
            ControlToValidate="txtproject_no" ErrorMessage="Project No required" ForeColor="Red"></asp:RequiredFieldValidator>
25
             </td>
26
        </tr>
27
        <tr>
28
        <td>Slip No :</td>
29
        <td>
30
        <asp:TextBox ID="txtslip_no" runat="server"></asp:TextBox>
31
        </td>
32
              <td>
33
             <asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server"   
34
            ControlToValidate="txtslip_no" ErrorMessage="Slip No required" ForeColor="Red"></asp:RequiredFieldValidator>
35
             </td>
36
        </tr>
37
        </tr>
38
        <tr>
39
        <td>User ID :</td>
40
        <td>
41
        <asp:TextBox ID="txtuser_id" runat="server"></asp:TextBox>
42
        </td>
43
              <td>
44
             <asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server"   
45
            ControlToValidate="txtuser_id" ErrorMessage="User ID required" ForeColor="Red"></asp:RequiredFieldValidator>
46
             </td>
47
        </tr>
48
        </table>
49
        </div>
50
        <p>
51
           <asp:Button ID="Button1" runat="server" Text="All Approval" 
52
                onclick="Button1_Click" /> 
53
        </p>
54
    </form>
55
</body>
56
</html>
KCOM_API_AutoStamping/AutoApprovalTest.aspx.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Net;
5
using System.Web;
6
using System.Web.UI;
7
using System.Web.UI.WebControls;
8
using System.Xml;
9

  
10
namespace KCOM_API_AutoStamping
11
{
12
    public partial class AutoApprovalTest : System.Web.UI.Page
13
    {
14
        protected void Page_Load(object sender, EventArgs e)
15
        {
16
        }
17

  
18
        protected void Button1_Click(object sender, EventArgs e)
19
        {
20
            string project_no = this.txtproject_no.Text.Trim().ToString();
21
            string slip_no = this.txtslip_no.Text.Trim().ToString();
22
            string user_id = this.txtuser_id.Text.Trim().ToString();
23

  
24
            WebClient client = new WebClient();
25
            string reqstr = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">"
26
                            + "<soapenv:Header/>"
27
                            + "<soapenv:Body>"
28
                            + "<AutoStamping>"
29
                            + "<project_no>" + project_no + "</project_no>"
30
                            + "<slip_no>" + slip_no + "</slip_no>"
31
                            + "<user_id>" + user_id + "</user_id>"
32
                            + "</AutoStamping>"
33
                            + "</soapenv:Body>"
34
                            + "</soapenv:Envelope>";
35
            client.Headers.Add(HttpRequestHeader.ContentType, "text/xml");
36
            client.Headers.Add("SOAPAction", "urn:Common/AutoStamping");
37

  
38
             
39

  
40
            string _result = client.UploadString(new Uri($"http://{Request.Url.Host.ToString()}:{Request.Url.Port}/AutoStamping.svc"), reqstr);
41
            XmlTextReader reader = new XmlTextReader(new System.IO.StringReader(_result));
42
            string msg = "Success";
43

  
44
            while (reader.Read())
45
            {
46
                switch (reader.NodeType)
47
                {
48
                    case XmlNodeType.Element:
49
                        if (reader.Name == "AutoStampingResult")
50
                        {
51
                            reader.Read();
52
                            if (!string.IsNullOrEmpty(reader.Value))
53
                                msg = "Error:" + reader.Value;
54
                        }
55
                        break;
56
                }
57
            }
58

  
59
            Response.Write("<script language='Javascript'> ");
60
            Response.Write("alert('" + msg + "'); ");
61
            Response.Write("</script>");
62
        }
63
    }
64
}
KCOM_API_AutoStamping/AutoApprovalTest.aspx.designer.cs
1
//------------------------------------------------------------------------------
2
// <자동 생성됨>
3
//     이 코드는 도구를 사용하여 생성되었습니다.
4
//
5
//     파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
6
//     이러한 변경 내용이 손실됩니다. 
7
// </자동 생성됨>
8
//------------------------------------------------------------------------------
9

  
10
namespace KCOM_API_AutoStamping {
11
    
12
    
13
    public partial class AutoApprovalTest {
14
        
15
        /// <summary>
16
        /// form1 컨트롤입니다.
17
        /// </summary>
18
        /// <remarks>
19
        /// 자동 생성 필드입니다.
20
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
21
        /// </remarks>
22
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
23
        
24
        /// <summary>
25
        /// txtproject_no 컨트롤입니다.
26
        /// </summary>
27
        /// <remarks>
28
        /// 자동 생성 필드입니다.
29
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
30
        /// </remarks>
31
        protected global::System.Web.UI.WebControls.TextBox txtproject_no;
32
        
33
        /// <summary>
34
        /// RequiredFieldValidator1 컨트롤입니다.
35
        /// </summary>
36
        /// <remarks>
37
        /// 자동 생성 필드입니다.
38
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
39
        /// </remarks>
40
        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
41
        
42
        /// <summary>
43
        /// txtslip_no 컨트롤입니다.
44
        /// </summary>
45
        /// <remarks>
46
        /// 자동 생성 필드입니다.
47
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
48
        /// </remarks>
49
        protected global::System.Web.UI.WebControls.TextBox txtslip_no;
50
        
51
        /// <summary>
52
        /// RequiredFieldValidator2 컨트롤입니다.
53
        /// </summary>
54
        /// <remarks>
55
        /// 자동 생성 필드입니다.
56
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
57
        /// </remarks>
58
        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator2;
59
        
60
        /// <summary>
61
        /// txtuser_id 컨트롤입니다.
62
        /// </summary>
63
        /// <remarks>
64
        /// 자동 생성 필드입니다.
65
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
66
        /// </remarks>
67
        protected global::System.Web.UI.WebControls.TextBox txtuser_id;
68
        
69
        /// <summary>
70
        /// RequiredFieldValidator3 컨트롤입니다.
71
        /// </summary>
72
        /// <remarks>
73
        /// 자동 생성 필드입니다.
74
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
75
        /// </remarks>
76
        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator3;
77
        
78
        /// <summary>
79
        /// Button1 컨트롤입니다.
80
        /// </summary>
81
        /// <remarks>
82
        /// 자동 생성 필드입니다.
83
        /// 수정하려면 디자이너 파일에서 코드 숨김 파일로 필드 선언을 이동하세요.
84
        /// </remarks>
85
        protected global::System.Web.UI.WebControls.Button Button1;
86
    }
87
}
KCOM_API_AutoStamping/AutoStamping.svc
1
<%@ ServiceHost Language="C#" Debug="true" Service="KCOM_API.Common" CodeBehind="AutoStamping.svc.cs" %>
KCOM_API_AutoStamping/AutoStamping.svc.cs
1
using IFinalPDF;
2
using KCOMDataModel.Common;
3
using KCOMDataModel.DataModel;
4
using log4net;
5
using log4net.Config;
6
using MarkupToPDF.Controls.Etc;
7
using MarkupToPDF.Controls.Shape;
8
using MarkupToPDF.Controls.Text;
9
using System;
10
using System.Collections.Generic;
11
using System.Configuration;
12
using System.Linq;
13
using System.Runtime.Remoting.Channels.Tcp;
14
using System.Runtime.Serialization;
15
using System.ServiceModel;
16
using System.ServiceModel.Activation;
17
using System.ServiceModel.Web;
18
using System.Text;
19
using System.Threading;
20
using System.Windows;
21
using System.Windows.Controls;
22
using System.Windows.Threading;
23

  
24
namespace KCOM_API
25
{
26
    [ServiceContract(Namespace = "")]
27
    [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
28
    //[ServiceBehavior(ConcurrencyMode = ConcurrencyMode.Single, InstanceContextMode = InstanceContextMode.PerCall)]
29
    public class Common :  System.Web.Services.WebService
30
    {
31
        private static log4net.ILog logger;
32

  
33
        public Common()
34
        {
35
            XmlConfigurator.Configure();
36
            //Get logger
37
            logger = LogManager.GetLogger(typeof(Common));
38
            //Start logging
39
            logger.Info("KCOM_API Common Call");
40
        }
41

  
42

  
43
        [OperationContract]
44
        public string AutoStamping(string project_no, string slip_no, string user_id)
45
        {
46
            string result = string.Empty;
47
            try
48
            {
49
                var waiter = new ManualResetEvent(false);
50

  
51
                var staThread = new Thread(() =>
52
                {
53
                    result = StampSave(project_no, slip_no, user_id);
54

  
55
                    waiter.Set();
56
                });
57

  
58
                staThread.SetApartmentState(ApartmentState.STA);
59
                staThread.Start();
60

  
61
                var timeout = new TimeSpan(0,1,0);
62
                waiter.WaitOne(timeout);
63
            }
64
            catch (Exception exception)
65
            {
66
                logger.Error(exception);
67

  
68
                result = exception.ToString();
69
            }
70
            return result;
71
        }
72

  
73
        /// <summary>
74
        /// 심볼로 변경
75
        /// </summary>
76
        /// <param name="project_no"></param>
77
        /// <param name="slip_no"></param>
78
        /// <param name="user_id"></param>
79
        private string StampSave(string project_no, string slip_no, string user_id)
80
        {
81
            string result = string.Empty;
82
            try
83
            {
84
                logger.Info($"Stamp  ProjecNO : {project_no}  SlipNO : {slip_no}  UserID : {user_id}");
85

  
86
                string _stampData = null;
87

  
88
                using (KCOMEntities _entity = new KCOMEntities(ConnectStringBuilder.KCOMConnectionString().ToString()))
89
                {
90
                    var stamp = _entity.PROPERTIES.Where(x=> x.TYPE == "STAMP");
91
                    
92
                    if(stamp.Count() > 0)
93
                    {
94
                        _stampData = stamp.First().VALUE;
95
                    }
96
                    else
97
                    {
98
                        result = "STAMP IS NULL.";
99
                    }
100
                };
101

  
102
                if (_stampData != null)
103
                {
104
                    using (CIEntities cIEntity = new CIEntities(ConnectStringBuilder.ProjectCIConnectString(project_no).ToString()))
105
                    {
106
                        logger.Info($"Connection CI DataBase :{cIEntity.Connection.Database} DataSource :{cIEntity.Connection.DataSource}");
107

  
108
                        var list = (from doc in cIEntity.DOCUMENT_ITEM
109
                                    where doc.GROUP_NO == slip_no && doc.PROJECT_NO == project_no
110
                                    select doc).ToList();
111

  
112
                        string userName = null;
113

  
114
                        var user = GetSelectMember(cIEntity, project_no, slip_no, user_id);
115

  
116

  
117
                        if (user.IS_ORIGINATOR == 0)
118
                        {
119
                            result = "You are not an originator of the slip.";
120
                        }
121
                        else
122
                        {
123
                            if (user.USER_NAME == null)
124
                            {
125
                                result = "user name IS NULL.";
126
                            }
127
                            else
128
                            {
129
                                userName = user.USER_NAME;
130

  
131
                                foreach (DOCUMENT_ITEM dOCUMENTITEM in list)
132
                                {
133
                                    DOCINFO dOCINFO = (
134
                                        from x in cIEntity.DOCINFO
135
                                        where x.PROJECT_NO == project_no && x.DOCUMENT_ID == dOCUMENTITEM.DOCUMENT_ID
136
                                        select x).FirstOrDefault<DOCINFO>();
137

  
138
                                    MARKUP_INFO mARKUPINFO = (
139
                                        from x in cIEntity.MARKUP_INFO
140
                                        where x.DOCINFO_ID == dOCINFO.ID && x.AVOID_CONSOLIDATE == 0 && x.CONSOLIDATE == 1
141
                                        select x).FirstOrDefault<MARKUP_INFO>();
142

  
143
                                    if (mARKUPINFO == null)
144
                                    {
145
                                        var pageInfo = dOCINFO.DOCPAGE.First();
146

  
147
                                        mARKUPINFO = new MARKUP_INFO()
148
                                        {
149
                                            ID = shortGuid(),
150
                                            DOCINFO_ID = dOCINFO.ID,
151
                                            USER_ID = user_id,
152
                                            CREATE_TIME = DateTime.Now,
153
                                            CONSOLIDATE = 1,
154
                                            AVOID_CONSOLIDATE = 0,
155
                                            PART_CONSOLIDATE = 0,
156
                                            DESCRIPTION = "",
157
                                            UPDATE_TIME = new DateTime?(DateTime.Now),
158
                                        };
159

  
160
                                        cIEntity.MARKUP_INFO.AddObject(mARKUPINFO);
161

  
162
                                        MARKUP_INFO_VERSION mARKUPINFOVERSION = new MARKUP_INFO_VERSION()
163
                                        {
164
                                            ID = shortGuid(),
165
                                            MARKUPINFO_ID = mARKUPINFO.ID,
166
                                            CREATE_DATE = DateTime.Now
167
                                        };
168

  
169
                                        cIEntity.MARKUP_INFO_VERSION.AddObject(mARKUPINFOVERSION);
170

  
171
                                        Point startPoint = new Point(15, 15);
172

  
173
                                        var symCtrl = GetSymNControl(Convert.ToDouble(pageInfo.PAGE_WIDTH), Convert.ToDouble(pageInfo.PAGE_HEIGHT), mARKUPINFO.USER_ID, mARKUPINFO.ID, startPoint, _stampData);
174

  
175
                                        var bottom = Rect.Offset(symCtrl.ItemRect, new Vector(0, symCtrl.ItemRect.Height));
176

  
177
                                        var txtOriginator = GetTextControl(Convert.ToDouble(pageInfo.PAGE_WIDTH), Convert.ToDouble(pageInfo.PAGE_HEIGHT), mARKUPINFO.USER_ID, mARKUPINFO.ID
178
                                                       , userName, 20, System.Windows.Media.Color.FromArgb(255, 0, 0, 255), FontWeights.Bold, TextAlignment.Center, bottom, bottom.Top + 3);
179

  
180
                                        var dtfi = new System.Globalization.DateTimeFormatInfo { DateSeparator = "-", ShortDatePattern = @"yyyy/MM/dd" };
181

  
182
                                        var txtDate = GetTextControl(Convert.ToDouble(pageInfo.PAGE_WIDTH), Convert.ToDouble(pageInfo.PAGE_HEIGHT), mARKUPINFO.USER_ID, mARKUPINFO.ID
183
                                                       , DateTime.Now.ToString("d", dtfi), 20,System.Windows.Media.Color.FromArgb(255, 255, 0, 0), FontWeights.Bold, TextAlignment.Center, bottom, txtOriginator.StartPoint.Y + txtOriginator.BoxHeight + 2);
184

  
185
                                        var symData = symCtrl.GetMarkupData(mARKUPINFO.USER_ID, 1, mARKUPINFOVERSION.ID);
186
                                        cIEntity.MARKUP_DATA.AddObject(symData);
187
                                        cIEntity.MARKUP_DATA.AddObject(txtOriginator.GetMarkupData(mARKUPINFO.USER_ID, 1, mARKUPINFOVERSION.ID));
188
                                        cIEntity.MARKUP_DATA.AddObject(txtDate.GetMarkupData(mARKUPINFO.USER_ID, 1, mARKUPINFOVERSION.ID));
189
                                    }
190
                                    cIEntity.SaveChanges();
191

  
192

  
193
                                    this.SetFinalPDF(project_no, dOCINFO.ID, mARKUPINFO.ID, user_id);
194
                                }
195
                            }
196
                        }
197
                    }
198
                }
199

  
200
            }
201
            catch (Exception ex)
202
            {
203
                logger.Error($"StampSave ProjectNO : {project_no} slipNo : {slip_no} userID : {user_id}" + ex);
204
                result = "Stamp Save Error";
205
            }
206

  
207
            return result;
208
        }
209

  
210
        private List<MEMBER> GetMemberQuery(System.Data.Objects.ObjectContext context, string UserID)
211
        {
212
            List<MEMBER> result = new List<MEMBER>();
213

  
214
            try
215
            {
216
                string query = "SELECT members.ID,members.NAME,members.DEPARTMENT FROM CIEntities.MEMBER as members where members.ID = @userId";
217

  
218
                var param = new[] { new System.Data.Objects.ObjectParameter("userId", UserID) };
219

  
220
                System.Data.Objects.ObjectQuery<System.Data.Common.DbDataRecord> memberQuery
221
                              = context.CreateQuery<System.Data.Common.DbDataRecord>(query, param);
222
             
223
                if (memberQuery.Count() > 0)
224
                {
225
                    foreach (var dataRecord in memberQuery)
226
                    {
227
                        MEMBER member = new MEMBER();
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)