프로젝트

일반

사용자정보

개정판 c7f3eb42

IDc7f3eb422e19ba58909a21e2761490536a77b034
상위 a944d624
하위 4eb362f3

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

issue #00000 markus image Create 수정

Change-Id: I9fc9beeea867be787be7c425e905b6fdfeadfbba

차이점 보기:

ID2.Manager/ID2.Manager.Controller/Controllers/MarkusInfoController.cs
11 11
{
12 12
    public class MarkusInfoController : BaseController
13 13
    {
14
        public IEnumerable<MarkupText> GetMarkupData(IEnumerable<string> ProjectNoList, IEnumerable<string> DocumentNoList)
15
        {
16
            IEnumerable<MarkupText> result = null;
14
        //public IEnumerable<MarkupText> GetMarkupData(IEnumerable<string> ProjectNoList, IEnumerable<string> DocumentNoList)
15
        //{
16
        //    IEnumerable<MarkupText> result = null;
17 17

  
18
            using (MarkusRepository rep = new MarkusRepository(this._MARKUSCONNSTR))
19
            {
20
                result = rep.GetMarkupText(ProjectNoList, DocumentNoList);
21
            }
18
        //    using (MarkusRepository rep = new MarkusRepository(this._MARKUSCONNSTR))
19
        //    {
20
        //        result = rep.GetMarkupText(ProjectNoList, DocumentNoList);
21
        //    }
22 22

  
23
            return result;
24
        }
23
        //    return result;
24
        //}
25 25

  
26 26
        public bool SetMarkusInfo(List<Documents> docList)
27 27
        {
ID2.Manager/ID2.Manager.Dapper/Repository/BaseRepository.cs
7 7
using System.Data;
8 8
using System.Data.SqlClient;
9 9
using System.ComponentModel.DataAnnotations.Schema;
10
#if !MARKUS_IMAGE_CREATE
10 11
using System.Data.SQLite;
11

  
12
#endif
12 13
using Dapper;
13 14

  
14 15
namespace ID2.Manager.Dapper.Repository
......
24 25
        {
25 26
            switch (dbType)
26 27
            {
28
#if !MARKUS_IMAGE_CREATE
27 29
                case DatabaseType.SQLITE:
28 30
                    this._DbConnection = this.SQLiteDBConnection(connectionStr);
29 31
                    break;
32
#endif
30 33
                case DatabaseType.MSSQL:
31 34
                default:
32 35
                    this._DbConnection = this.DBConnection(connectionStr);
......
59 62
        {
60 63
            return new SqlConnection(connectionStr);
61 64
        }
62

  
65
#if !MARKUS_IMAGE_CREATE
63 66
        public SQLiteConnection SQLiteDBConnection(string connectionStr)
64 67
        {
65 68
            return new SQLiteConnection(connectionStr, true);
66 69
        }
70
#endif
67 71

  
68 72
        public IDbTransaction BeginTransaction()
69 73
        {
ID2.Manager/ID2.Manager.Dapper/Repository/MarkusRepository.cs
158 158
            return convertItems;
159 159
        }
160 160

  
161
        public IEnumerable<MarkupText> GetMarkupText(IEnumerable<string> ProjectNoList, IEnumerable<string> DocumentNoList)
162
        {
163
            string SQL = "GET_MARKUPDATA";
161
        //public IEnumerable<MarkupText> GetMarkupText(IEnumerable<string> ProjectNoList, IEnumerable<string> DocumentNoList)
162
        //{
163
        //    string SQL = "GET_MARKUPDATA";
164 164

  
165
            var parameters = new DynamicParameters();
166
            parameters.AddTable("@PROJECT_NOs", "VARCHAR_TABLE", ProjectNoList.Select(x=>new VARCHAR_TABLE { ITEM = x }));
167
            parameters.AddTable("@DOCUMENT_IDs", "VARCHAR_TABLE", DocumentNoList.Select(x => new VARCHAR_TABLE { ITEM = x }));
165
        //    var parameters = new DynamicParameters();
166
        //    parameters.AddTable("@PROJECT_NOs", "VARCHAR_TABLE", ProjectNoList.Select(x=>new VARCHAR_TABLE { ITEM = x }));
167
        //    parameters.AddTable("@DOCUMENT_IDs", "VARCHAR_TABLE", DocumentNoList.Select(x => new VARCHAR_TABLE { ITEM = x }));
168 168

  
169
            var Items = base.Query<MarkupText>(SQL, parameters,commandType:CommandType.StoredProcedure);
169
        //    var Items = base.Query<MarkupText>(SQL, parameters,commandType:CommandType.StoredProcedure);
170 170

  
171
            return Items;
172
        }
171
        //    return Items;
172
        //}
173 173

  
174 174
        /// <summary>
175 175
        /// 완료
......
308 308

  
309 309
                var parameter = new DynamicParameters();
310 310

  
311
                parameter.AddTable("DOCPAGES", "TYPE_INSERT_DOCPAGE", docPages);
311
                parameter.AddTable< DocPage>("DOCPAGES", "TYPE_INSERT_DOCPAGE", docPages.ToList());
312 312

  
313 313
                var id = base.Execute("CONVERT_INSERT_DOCPAGE", parameter, tran, commandType: CommandType.StoredProcedure);
314 314

  
ID2.Manager/ID2.Manager.sln
25 25
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
26 26
		Debug|Any CPU = Debug|Any CPU
27 27
		Debug|x64 = Debug|x64
28
		Debug|x86 = Debug|x86
29
		MarkusImageCreate|Any CPU = MarkusImageCreate|Any CPU
30
		MarkusImageCreate|x64 = MarkusImageCreate|x64
31
		MarkusImageCreate|x86 = MarkusImageCreate|x86
28 32
		Release|Any CPU = Release|Any CPU
29 33
		Release|x64 = Release|x64
34
		Release|x86 = Release|x86
30 35
	EndGlobalSection
31 36
	GlobalSection(ProjectConfigurationPlatforms) = postSolution
32 37
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33 38
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
34 39
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Debug|x64.ActiveCfg = Debug|x64
35 40
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Debug|x64.Build.0 = Debug|x64
41
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Debug|x86.ActiveCfg = Debug|Any CPU
42
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Debug|x86.Build.0 = Debug|Any CPU
43
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.MarkusImageCreate|Any CPU.ActiveCfg = Debug|Any CPU
44
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.MarkusImageCreate|Any CPU.Build.0 = Debug|Any CPU
45
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.MarkusImageCreate|x64.ActiveCfg = Debug|x64
46
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.MarkusImageCreate|x64.Build.0 = Debug|x64
47
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.MarkusImageCreate|x86.ActiveCfg = Debug|Any CPU
36 48
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
37 49
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Release|Any CPU.Build.0 = Release|Any CPU
38 50
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Release|x64.ActiveCfg = Release|x64
39 51
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Release|x64.Build.0 = Release|x64
52
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Release|x86.ActiveCfg = Release|Any CPU
53
		{226CE2A3-DD88-4C99-A8E6-FAC5A4D78C71}.Release|x86.Build.0 = Release|Any CPU
40 54
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41 55
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
42 56
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Debug|x64.ActiveCfg = Debug|x64
43 57
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Debug|x64.Build.0 = Debug|x64
58
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Debug|x86.ActiveCfg = Debug|Any CPU
59
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Debug|x86.Build.0 = Debug|Any CPU
60
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.MarkusImageCreate|Any CPU.ActiveCfg = Debug|Any CPU
61
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.MarkusImageCreate|Any CPU.Build.0 = Debug|Any CPU
62
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.MarkusImageCreate|x64.ActiveCfg = Debug|x64
63
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.MarkusImageCreate|x64.Build.0 = Debug|x64
64
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.MarkusImageCreate|x86.ActiveCfg = Debug|Any CPU
44 65
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
45 66
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Release|Any CPU.Build.0 = Release|Any CPU
46 67
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Release|x64.ActiveCfg = Release|x64
47 68
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Release|x64.Build.0 = Release|x64
69
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Release|x86.ActiveCfg = Release|Any CPU
70
		{D5ABDF40-CA97-4B5A-A08C-63D7D53BCA3A}.Release|x86.Build.0 = Release|Any CPU
48 71
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49 72
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
50 73
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Debug|x64.ActiveCfg = Debug|x64
51 74
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Debug|x64.Build.0 = Debug|x64
75
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Debug|x86.ActiveCfg = Debug|Any CPU
76
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Debug|x86.Build.0 = Debug|Any CPU
77
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.MarkusImageCreate|Any CPU.ActiveCfg = Debug|Any CPU
78
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.MarkusImageCreate|Any CPU.Build.0 = Debug|Any CPU
79
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.MarkusImageCreate|x64.ActiveCfg = Debug|x64
80
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.MarkusImageCreate|x64.Build.0 = Debug|x64
81
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.MarkusImageCreate|x86.ActiveCfg = Debug|Any CPU
52 82
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
53 83
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Release|Any CPU.Build.0 = Release|Any CPU
54 84
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Release|x64.ActiveCfg = Release|x64
55 85
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Release|x64.Build.0 = Release|x64
86
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Release|x86.ActiveCfg = Release|Any CPU
87
		{6D22AAA8-D584-43F4-B71C-B32C5C9288ED}.Release|x86.Build.0 = Release|Any CPU
56 88
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57 89
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
58 90
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Debug|x64.ActiveCfg = Debug|x64
59 91
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Debug|x64.Build.0 = Debug|x64
92
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Debug|x86.ActiveCfg = Debug|Any CPU
93
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Debug|x86.Build.0 = Debug|Any CPU
94
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.MarkusImageCreate|Any CPU.ActiveCfg = Debug|Any CPU
95
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.MarkusImageCreate|Any CPU.Build.0 = Debug|Any CPU
96
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.MarkusImageCreate|x64.ActiveCfg = Debug|x64
97
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.MarkusImageCreate|x64.Build.0 = Debug|x64
98
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.MarkusImageCreate|x86.ActiveCfg = Debug|Any CPU
60 99
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
61 100
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Release|Any CPU.Build.0 = Release|Any CPU
62 101
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Release|x64.ActiveCfg = Release|x64
63 102
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Release|x64.Build.0 = Release|x64
103
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Release|x86.ActiveCfg = Release|Any CPU
104
		{B17C0800-40F4-40E2-B5A6-D366D9C2E0F6}.Release|x86.Build.0 = Release|Any CPU
64 105
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65 106
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Debug|Any CPU.Build.0 = Debug|Any CPU
66 107
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Debug|x64.ActiveCfg = Debug|x64
67 108
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Debug|x64.Build.0 = Debug|x64
109
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Debug|x86.ActiveCfg = Debug|Any CPU
110
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Debug|x86.Build.0 = Debug|Any CPU
111
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.MarkusImageCreate|Any CPU.ActiveCfg = Debug|Any CPU
112
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.MarkusImageCreate|Any CPU.Build.0 = Debug|Any CPU
113
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.MarkusImageCreate|x64.ActiveCfg = Debug|x64
114
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.MarkusImageCreate|x64.Build.0 = Debug|x64
115
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.MarkusImageCreate|x86.ActiveCfg = Debug|Any CPU
68 116
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Release|Any CPU.ActiveCfg = Release|Any CPU
69 117
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Release|Any CPU.Build.0 = Release|Any CPU
70 118
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Release|x64.ActiveCfg = Release|x64
71 119
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Release|x64.Build.0 = Release|x64
120
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Release|x86.ActiveCfg = Release|Any CPU
121
		{83DACC10-43B1-4E38-ABEF-E5EF9492A82D}.Release|x86.Build.0 = Release|Any CPU
72 122
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
73 123
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
74 124
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Debug|x64.ActiveCfg = Debug|x64
75 125
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Debug|x64.Build.0 = Debug|x64
126
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Debug|x86.ActiveCfg = Debug|Any CPU
127
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Debug|x86.Build.0 = Debug|Any CPU
128
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.MarkusImageCreate|Any CPU.ActiveCfg = Debug|Any CPU
129
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.MarkusImageCreate|Any CPU.Build.0 = Debug|Any CPU
130
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.MarkusImageCreate|x64.ActiveCfg = Debug|x64
131
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.MarkusImageCreate|x64.Build.0 = Debug|x64
132
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.MarkusImageCreate|x86.ActiveCfg = Debug|x86
133
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.MarkusImageCreate|x86.Build.0 = Debug|x86
76 134
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
77 135
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Release|Any CPU.Build.0 = Release|Any CPU
78 136
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Release|x64.ActiveCfg = Release|Any CPU
79 137
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Release|x64.Build.0 = Release|Any CPU
138
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Release|x86.ActiveCfg = Release|Any CPU
139
		{465FA895-49CF-4E6D-A0E4-D12CA03B9FD5}.Release|x86.Build.0 = Release|Any CPU
80 140
	EndGlobalSection
81 141
	GlobalSection(SolutionProperties) = preSolution
82 142
		HideSolutionNode = FALSE
ID2.Manager/ID2.Manager/Main.Designer.cs
449 449
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
450 450
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
451 451
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
452
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 221F));
452
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 225F));
453 453
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 1);
454 454
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 1);
455 455
            this.tableLayoutPanelCondition.Controls.Add(this.radLabelFrReviewStatus, 3, 1);
......
499 499
            this.radDropDownListFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
500 500
            this.radDropDownListFrReviewStatus.DropDownAnimationEnabled = true;
501 501
            this.radDropDownListFrReviewStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
502
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(327, 34);
502
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(326, 34);
503 503
            this.radDropDownListFrReviewStatus.Name = "radDropDownListFrReviewStatus";
504
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(88, 20);
504
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(87, 20);
505 505
            this.radDropDownListFrReviewStatus.TabIndex = 18;
506 506
            // 
507 507
            // radDropDownListToIsDiscussion
......
511 511
            this.radDropDownListToIsDiscussion.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
512 512
            this.radDropDownListToIsDiscussion.Location = new System.Drawing.Point(146, 34);
513 513
            this.radDropDownListToIsDiscussion.Name = "radDropDownListToIsDiscussion";
514
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(88, 20);
514
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(87, 20);
515 515
            this.radDropDownListToIsDiscussion.TabIndex = 17;
516 516
            // 
517 517
            // radLabelFrReviewStatus
518 518
            // 
519 519
            this.radLabelFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
520 520
            this.radLabelFrReviewStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
521
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(241, 35);
521
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(240, 35);
522 522
            this.radLabelFrReviewStatus.Name = "radLabelFrReviewStatus";
523 523
            this.radLabelFrReviewStatus.Size = new System.Drawing.Size(59, 17);
524 524
            this.radLabelFrReviewStatus.TabIndex = 7;
......
548 548
            // 
549 549
            this.radLabelAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
550 550
            this.radLabelAVEVAStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
551
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(241, 64);
551
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(240, 64);
552 552
            this.radLabelAVEVAStatus.Name = "radLabelAVEVAStatus";
553 553
            this.radLabelAVEVAStatus.Size = new System.Drawing.Size(86, 17);
554 554
            this.radLabelAVEVAStatus.TabIndex = 8;
......
558 558
            // 
559 559
            this.radLabelIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
560 560
            this.radLabelIsID2Work.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
561
            this.radLabelIsID2Work.Location = new System.Drawing.Point(422, 35);
561
            this.radLabelIsID2Work.Location = new System.Drawing.Point(420, 35);
562 562
            this.radLabelIsID2Work.Name = "radLabelIsID2Work";
563 563
            this.radLabelIsID2Work.Size = new System.Drawing.Size(80, 17);
564 564
            this.radLabelIsID2Work.TabIndex = 6;
......
568 568
            // 
569 569
            this.radLabelJobLevel.Anchor = System.Windows.Forms.AnchorStyles.Left;
570 570
            this.radLabelJobLevel.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
571
            this.radLabelJobLevel.Location = new System.Drawing.Point(422, 6);
571
            this.radLabelJobLevel.Location = new System.Drawing.Point(420, 6);
572 572
            this.radLabelJobLevel.Name = "radLabelJobLevel";
573 573
            this.radLabelJobLevel.Size = new System.Drawing.Size(47, 17);
574 574
            this.radLabelJobLevel.TabIndex = 7;
......
619 619
            this.radButtonSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
620 620
            this.radButtonSearch.Cursor = System.Windows.Forms.Cursors.WaitCursor;
621 621
            this.radButtonSearch.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
622
            this.radButtonSearch.Location = new System.Drawing.Point(866, 4);
622
            this.radButtonSearch.Location = new System.Drawing.Point(864, 4);
623 623
            this.radButtonSearch.Name = "radButtonSearch";
624 624
            this.tableLayoutPanelCondition.SetRowSpan(this.radButtonSearch, 5);
625 625
            this.radButtonSearch.Size = new System.Drawing.Size(54, 136);
......
633 633
            this.radDropDownListProject.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
634 634
            this.radDropDownListProject.Location = new System.Drawing.Point(146, 5);
635 635
            this.radDropDownListProject.Name = "radDropDownListProject";
636
            this.radDropDownListProject.Size = new System.Drawing.Size(88, 20);
636
            this.radDropDownListProject.Size = new System.Drawing.Size(87, 20);
637 637
            this.radDropDownListProject.TabIndex = 7;
638 638
            // 
639 639
            // radLabelDocumentNo
640 640
            // 
641 641
            this.radLabelDocumentNo.Anchor = System.Windows.Forms.AnchorStyles.Left;
642 642
            this.radLabelDocumentNo.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
643
            this.radLabelDocumentNo.Location = new System.Drawing.Point(603, 6);
643
            this.radLabelDocumentNo.Location = new System.Drawing.Point(600, 6);
644 644
            this.radLabelDocumentNo.Name = "radLabelDocumentNo";
645 645
            this.radLabelDocumentNo.Size = new System.Drawing.Size(49, 17);
646 646
            this.radLabelDocumentNo.TabIndex = 6;
......
649 649
            // radTextBoxDocumentNo
650 650
            // 
651 651
            this.radTextBoxDocumentNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
652
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(689, 5);
652
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(686, 5);
653 653
            this.radTextBoxDocumentNo.Name = "radTextBoxDocumentNo";
654
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(88, 20);
654
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(87, 20);
655 655
            this.radTextBoxDocumentNo.TabIndex = 8;
656 656
            // 
657 657
            // radLabelPersonInCharge
658 658
            // 
659 659
            this.radLabelPersonInCharge.Anchor = System.Windows.Forms.AnchorStyles.Left;
660 660
            this.radLabelPersonInCharge.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
661
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(241, 6);
661
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(240, 6);
662 662
            this.radLabelPersonInCharge.Name = "radLabelPersonInCharge";
663 663
            this.radLabelPersonInCharge.Size = new System.Drawing.Size(47, 17);
664 664
            this.radLabelPersonInCharge.TabIndex = 6;
......
669 669
            this.radDropDownListPersonInCharge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
670 670
            this.radDropDownListPersonInCharge.DropDownAnimationEnabled = true;
671 671
            this.radDropDownListPersonInCharge.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
672
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(327, 5);
672
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(326, 5);
673 673
            this.radDropDownListPersonInCharge.Name = "radDropDownListPersonInCharge";
674
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(88, 20);
674
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(87, 20);
675 675
            this.radDropDownListPersonInCharge.TabIndex = 9;
676 676
            // 
677 677
            // radLabel1
......
689 689
            this.radDropDownListJobLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
690 690
            this.radDropDownListJobLevel.DropDownAnimationEnabled = true;
691 691
            this.radDropDownListJobLevel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
692
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(508, 5);
692
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(506, 5);
693 693
            this.radDropDownListJobLevel.Name = "radDropDownListJobLevel";
694
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(88, 20);
694
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(87, 20);
695 695
            this.radDropDownListJobLevel.TabIndex = 11;
696 696
            // 
697 697
            // radLabelID2Status
......
708 708
            // 
709 709
            this.radLabel10.Anchor = System.Windows.Forms.AnchorStyles.Left;
710 710
            this.radLabel10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
711
            this.radLabel10.Location = new System.Drawing.Point(241, 93);
711
            this.radLabel10.Location = new System.Drawing.Point(240, 93);
712 712
            this.radLabel10.Name = "radLabel10";
713 713
            this.radLabel10.Size = new System.Drawing.Size(61, 17);
714 714
            this.radLabel10.TabIndex = 9;
......
719 719
            this.radDropDownListIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
720 720
            this.radDropDownListIsID2Work.DropDownAnimationEnabled = true;
721 721
            this.radDropDownListIsID2Work.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
722
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(508, 34);
722
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(506, 34);
723 723
            this.radDropDownListIsID2Work.Name = "radDropDownListIsID2Work";
724
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(88, 20);
724
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(87, 20);
725 725
            this.radDropDownListIsID2Work.TabIndex = 12;
726 726
            // 
727 727
            // radDropDownListID2Status
......
731 731
            this.radDropDownListID2Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
732 732
            this.radDropDownListID2Status.Location = new System.Drawing.Point(146, 63);
733 733
            this.radDropDownListID2Status.Name = "radDropDownListID2Status";
734
            this.radDropDownListID2Status.Size = new System.Drawing.Size(88, 20);
734
            this.radDropDownListID2Status.Size = new System.Drawing.Size(87, 20);
735 735
            this.radDropDownListID2Status.TabIndex = 13;
736 736
            // 
737 737
            // radDropDownListAVEVAStatus
......
739 739
            this.radDropDownListAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
740 740
            this.radDropDownListAVEVAStatus.DropDownAnimationEnabled = true;
741 741
            this.radDropDownListAVEVAStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
742
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(327, 63);
742
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(326, 63);
743 743
            this.radDropDownListAVEVAStatus.Name = "radDropDownListAVEVAStatus";
744
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(88, 20);
744
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(87, 20);
745 745
            this.radDropDownListAVEVAStatus.TabIndex = 14;
746 746
            // 
747 747
            // radDropDownListProdIsResult
......
751 751
            this.radDropDownListProdIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
752 752
            this.radDropDownListProdIsResult.Location = new System.Drawing.Point(146, 92);
753 753
            this.radDropDownListProdIsResult.Name = "radDropDownListProdIsResult";
754
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(88, 20);
754
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(87, 20);
755 755
            this.radDropDownListProdIsResult.TabIndex = 15;
756 756
            // 
757 757
            // radDropDownListClientIsResult
......
759 759
            this.radDropDownListClientIsResult.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
760 760
            this.radDropDownListClientIsResult.DropDownAnimationEnabled = true;
761 761
            this.radDropDownListClientIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
762
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(327, 92);
762
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(326, 92);
763 763
            this.radDropDownListClientIsResult.Name = "radDropDownListClientIsResult";
764
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(88, 20);
764
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(87, 20);
765 765
            this.radDropDownListClientIsResult.TabIndex = 16;
766 766
            // 
767 767
            // radLabel6
......
778 778
            // 
779 779
            this.radLabel7.Anchor = System.Windows.Forms.AnchorStyles.Left;
780 780
            this.radLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
781
            this.radLabel7.Location = new System.Drawing.Point(241, 121);
781
            this.radLabel7.Location = new System.Drawing.Point(240, 121);
782 782
            this.radLabel7.Name = "radLabel7";
783 783
            this.radLabel7.Size = new System.Drawing.Size(72, 17);
784 784
            this.radLabel7.TabIndex = 12;
......
801 801
            this.radDropDownListGateway.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
802 802
            this.radDropDownListGateway.Location = new System.Drawing.Point(146, 120);
803 803
            this.radDropDownListGateway.Name = "radDropDownListGateway";
804
            this.radDropDownListGateway.Size = new System.Drawing.Size(88, 20);
804
            this.radDropDownListGateway.Size = new System.Drawing.Size(87, 20);
805 805
            this.radDropDownListGateway.TabIndex = 19;
806 806
            // 
807 807
            // radDropDownListRegistration
......
809 809
            this.radDropDownListRegistration.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
810 810
            this.radDropDownListRegistration.DropDownAnimationEnabled = true;
811 811
            this.radDropDownListRegistration.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
812
            this.radDropDownListRegistration.Location = new System.Drawing.Point(327, 120);
812
            this.radDropDownListRegistration.Location = new System.Drawing.Point(326, 120);
813 813
            this.radDropDownListRegistration.Name = "radDropDownListRegistration";
814
            this.radDropDownListRegistration.Size = new System.Drawing.Size(88, 20);
814
            this.radDropDownListRegistration.Size = new System.Drawing.Size(87, 20);
815 815
            this.radDropDownListRegistration.TabIndex = 20;
816 816
            // 
817 817
            // tableLayoutPanelGroup
ID2.Manager/MarkusImageCreate/App.config
1
<?xml version="1.0" encoding="utf-8" ?>
1
<?xml version="1.0" encoding="utf-8"?>
2 2
<configuration>
3 3
    <startup> 
4
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
4
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
5 5
    </startup>
6
</configuration>
6
</configuration>
ID2.Manager/MarkusImageCreate/MarkusImageCreate.INI
4 4
#ID2Manager = ZABhAHQAYQAgAHMAbwB1AHIAYwBlAD0AMQA5ADIALgAxADYAOAAuADAALgA2ADcAOwBpAG4AaQB0AGkAYQBsACAAYwBhAHQAYQBsAG8AZwA9AEkARAAyAE0AYQBuAGEAZwBlAHIAOwBwAGUAcgBzAGkAcwB0ACAAcwBlAGMAdQByAGkAdAB5ACAAaQBuAGYAbwA9AFQAcgB1AGUAOwB1AHMAZQByACAAaQBkAD0AcwBhADsAcABhAHMAcwB3AG8AcgBkAD0AZABvAGYAMQAwADcAMwAjADsAbQB1AGwAdABpAHAAbABlAGEAYwB0AGkAdgBlAHIAZQBzAHUAbAB0AHMAZQB0AHMAPQBUAHIAdQBlAA==
5 5
#Markus = ZABhAHQAYQAgAHMAbwB1AHIAYwBlAD0AMQA5ADIALgAxADYAOAAuADAALgA2ADcAOwBpAG4AaQB0AGkAYQBsACAAYwBhAHQAYQBsAG8AZwA9AE0AYQByAGsAdQBzAF8AUwBFAEMAOwBwAGUAcgBzAGkAcwB0ACAAcwBlAGMAdQByAGkAdAB5ACAAaQBuAGYAbwA9AFQAcgB1AGUAOwB1AHMAZQByACAAaQBkAD0AZABvAGYAdABlAGMAaAA7AHAAYQBzAHMAdwBvAHIAZAA9AGQAbwBmADEAMAA3ADMAIwA7AG0AdQBsAHQAaQBwAGwAZQBhAGMAdABpAHYAZQByAGUAcwB1AGwAdABzAGUAdABzAD0AVAByAHUAZQA=
6 6
ID2ProjectsPath = \\DOFDEVSVR\ID2_Project
7
MarkusImagePath = \\DOFDEVSVR\ID2_Project
7
MarkusImagePath = D:\Temp\Markus
8 8
Resolution = 250
9 9
FontPath = C:\MarkusFonts
ID2.Manager/MarkusImageCreate/MarkusImageCreate.csproj
8 8
    <OutputType>Exe</OutputType>
9 9
    <RootNamespace>MarkusImageCreate</RootNamespace>
10 10
    <AssemblyName>MarkusImageCreate</AssemblyName>
11
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
11
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
12 12
    <FileAlignment>512</FileAlignment>
13 13
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14 14
    <Deterministic>true</Deterministic>
15
    <TargetFrameworkProfile />
15 16
  </PropertyGroup>
16 17
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17
    <PlatformTarget>x64</PlatformTarget>
18
    <PlatformTarget>x86</PlatformTarget>
18 19
    <DebugSymbols>true</DebugSymbols>
19 20
    <DebugType>full</DebugType>
20 21
    <Optimize>false</Optimize>
21 22
    <OutputPath>bin\Debug\</OutputPath>
22
    <DefineConstants>DEBUG;TRACE</DefineConstants>
23
    <DefineConstants>TRACE;DEBUG;MARKUS_IMAGE_CREATE</DefineConstants>
23 24
    <ErrorReport>prompt</ErrorReport>
24 25
    <WarningLevel>4</WarningLevel>
25 26
  </PropertyGroup>
......
35 36
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
36 37
    <DebugSymbols>true</DebugSymbols>
37 38
    <OutputPath>bin\x64\Debug\</OutputPath>
38
    <DefineConstants>DEBUG;TRACE</DefineConstants>
39
    <DefineConstants>TRACE;DEBUG;MARKUS_IMAGE_CREATE</DefineConstants>
39 40
    <DebugType>full</DebugType>
40
    <PlatformTarget>x64</PlatformTarget>
41
    <PlatformTarget>x86</PlatformTarget>
41 42
    <LangVersion>7.3</LangVersion>
42 43
    <ErrorReport>prompt</ErrorReport>
43 44
    <Prefer32Bit>true</Prefer32Bit>
......
52 53
    <ErrorReport>prompt</ErrorReport>
53 54
    <Prefer32Bit>true</Prefer32Bit>
54 55
  </PropertyGroup>
56
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
57
    <DebugSymbols>true</DebugSymbols>
58
    <OutputPath>bin\x86\Debug\</OutputPath>
59
    <DefineConstants>TRACE;DEBUG;MARKUS_IMAGE_CREATE</DefineConstants>
60
    <DebugType>full</DebugType>
61
    <PlatformTarget>x86</PlatformTarget>
62
    <LangVersion>7.3</LangVersion>
63
    <ErrorReport>prompt</ErrorReport>
64
    <Prefer32Bit>true</Prefer32Bit>
65
  </PropertyGroup>
66
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
67
    <OutputPath>bin\x86\Release\</OutputPath>
68
    <DefineConstants>TRACE</DefineConstants>
69
    <Optimize>true</Optimize>
70
    <DebugType>pdbonly</DebugType>
71
    <PlatformTarget>x86</PlatformTarget>
72
    <LangVersion>7.3</LangVersion>
73
    <ErrorReport>prompt</ErrorReport>
74
    <Prefer32Bit>true</Prefer32Bit>
75
  </PropertyGroup>
55 76
  <ItemGroup>
56 77
    <Reference Include="System" />
78
    <Reference Include="System.ComponentModel.DataAnnotations" />
57 79
    <Reference Include="System.Core" />
80
    <Reference Include="System.Drawing" />
81
    <Reference Include="System.Runtime.Serialization" />
58 82
    <Reference Include="System.Xml.Linq" />
59 83
    <Reference Include="System.Data.DataSetExtensions" />
60 84
    <Reference Include="Microsoft.CSharp" />
......
63 87
    <Reference Include="System.Xml" />
64 88
  </ItemGroup>
65 89
  <ItemGroup>
90
    <Compile Include="..\ID2.Manager.Dapper\DatabaseEnums.cs">
91
      <Link>Dapper\DatabaseEnums.cs</Link>
92
    </Compile>
93
    <Compile Include="..\ID2.Manager.Dapper\Entities\ConvertDoc.cs">
94
      <Link>Dapper\Entities\ConvertDoc.cs</Link>
95
    </Compile>
96
    <Compile Include="..\ID2.Manager.Dapper\Entities\DocPage.cs">
97
      <Link>Dapper\Entities\DocPage.cs</Link>
98
    </Compile>
99
    <Compile Include="..\ID2.Manager.Dapper\Entities\DOCUMENTITEM.cs">
100
      <Link>Dapper\Entities\DOCUMENTITEM.cs</Link>
101
    </Compile>
102
    <Compile Include="..\ID2.Manager.Dapper\Entities\MEMBER.cs">
103
      <Link>Dapper\Entities\MEMBER.cs</Link>
104
    </Compile>
105
    <Compile Include="..\ID2.Manager.Dapper\IBaseRepository.cs">
106
      <Link>Dapper\IBaseRepository.cs</Link>
107
    </Compile>
108
    <Compile Include="..\ID2.Manager.Dapper\Repository\BaseRepository.cs">
109
      <Link>Dapper\Repository\BaseRepository.cs</Link>
110
    </Compile>
111
    <Compile Include="..\ID2.Manager.Dapper\Repository\MarkusRepository.cs">
112
      <Link>Dapper\Repository\MarkusRepository.cs</Link>
113
    </Compile>
114
    <Compile Include="..\ID2.Manager.Dapper\Repository\ProjectRepository.cs">
115
      <Link>Dapper\Repository\ProjectRepository.cs</Link>
116
    </Compile>
117
    <Compile Include="..\ID2.Manager.Data\HashCodeHelper.cs">
118
      <Link>Dapper\HashCodeHelper.cs</Link>
119
    </Compile>
120
    <Compile Include="..\ID2.Manager.Data\Models\MarkupText.cs">
121
      <Link>Dapper\Models\MarkupText.cs</Link>
122
    </Compile>
123
    <Compile Include="..\ID2.Manager.Data\Models\ProjectInfo.cs">
124
      <Link>Dapper\Models\ProjectInfo.cs</Link>
125
    </Compile>
126
    <Compile Include="HostAppServ.cs" />
127
    <Compile Include="OdActivationInfo.cs" />
128
    <Compile Include="OdReadExMgd.cs" />
66 129
    <Compile Include="Program.cs" />
67 130
    <Compile Include="Properties\AssemblyInfo.cs" />
68 131
  </ItemGroup>
......
73 136
    </None>
74 137
  </ItemGroup>
75 138
  <ItemGroup>
76
    <PackageReference Include="Markus.Message">
77
      <Version>2.0.1</Version>
139
    <PackageReference Include="Dapper">
140
      <Version>1.60.6</Version>
78 141
    </PackageReference>
79
    <PackageReference Include="MarkusPDF">
80
      <Version>3.5.4</Version>
142
    <PackageReference Include="Dapper.ParameterExtensions">
143
      <Version>2018.12.7.1</Version>
81 144
    </PackageReference>
82
    <PackageReference Include="MarkusPDF.VC_redist">
83
      <Version>1.0.3</Version>
145
    <PackageReference Include="ODA_redist">
146
      <Version>1.3.0</Version>
84 147
    </PackageReference>
85 148
    <PackageReference Include="Salaros.ConfigParser">
86 149
      <Version>0.3.8</Version>
87 150
    </PackageReference>
88 151
  </ItemGroup>
89
  <ItemGroup>
90
    <ProjectReference Include="..\ID2.Manager.Dapper\ID2.Manager.Dapper.csproj">
91
      <Project>{6d22aaa8-d584-43f4-b71c-b32c5c9288ed}</Project>
92
      <Name>ID2.Manager.Dapper</Name>
93
    </ProjectReference>
94
    <ProjectReference Include="..\ID2.Manager.Data\ID2.Manager.Data.csproj">
95
      <Project>{b17c0800-40f4-40e2-b5a6-d366d9c2e0f6}</Project>
96
      <Name>ID2.Manager.Data</Name>
97
    </ProjectReference>
98
  </ItemGroup>
99 152
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100 153
</Project>
ID2.Manager/MarkusImageCreate/Program.cs
6 6
using System.Threading.Tasks;
7 7
using System.IO;
8 8
using ID2.Manager.Dapper.Entities;
9
using Teigha.DatabaseServices;
10
using OdReadExMgd;
9 11

  
10 12
namespace MarkusImageCreate
11 13
{
......
29 31

  
30 32
        static void Main(string[] args)
31 33
        {
32
            
33
            Salaros.Configuration.ConfigParser config = new Salaros.Configuration.ConfigParser(Path.Combine(AppContext.BaseDirectory,"MarkusImageCreate.ini"));
34
            ID2ConnectionStr = config.GetValue(CONST_SETTINGS, CONST_ID2Manager_Connect);
35
            MarkusConnectionStr = config.GetValue(CONST_SETTINGS, CONST_Markus_Connect);
36
            //ID2ConnectionStr = Encoding.Unicode.GetString(Convert.FromBase64String(config.GetValue(CONST_SETTINGS, CONST_ID2Manager_Connect)));
37
            //MarkusConnectionStr = Encoding.Unicode.GetString(Convert.FromBase64String(config.GetValue(CONST_SETTINGS, CONST_Markus_Connect)));
38
            ID2ProjectsPath = config.GetValue(CONST_SETTINGS, CONST_ID2ProjectsPath);
39
            MarkusImagePath = config.GetValue(CONST_SETTINGS, CONST_MarkusImagePath);
40
            Resolution = config.GetValue(CONST_SETTINGS, CONST_Resolution,250);
41
            FontPath = config.GetValue(CONST_SETTINGS, CONST_FontPath);
42

  
43
            InitConvertPDF();
34
            bool bSuccess = true;
35
            Teigha.Runtime.Services.odActivate(ActivationData.userInfo, ActivationData.userSignature);
36
            using (Teigha.Runtime.Services srv = new Teigha.Runtime.Services())
37
            {
38
                try
39
                {
40
                    HostApplicationServices.Current = new OdaMgdMViewApp.HostAppServ();
41
                    /**********************************************************************/
42
                    /* Display the Product and Version that created the executable        */
43
                    /**********************************************************************/
44
                    Console.WriteLine("\nReadExMgd developed using {0} ver {1}", HostApplicationServices.Current.Product, HostApplicationServices.Current.VersionString);
45

  
46
                    Salaros.Configuration.ConfigParser config = new Salaros.Configuration.ConfigParser(Path.Combine(AppContext.BaseDirectory, "MarkusImageCreate.ini"));
47
                    ID2ConnectionStr = config.GetValue(CONST_SETTINGS, CONST_ID2Manager_Connect);
48
                    MarkusConnectionStr = config.GetValue(CONST_SETTINGS, CONST_Markus_Connect);
49
                    //ID2ConnectionStr = Encoding.Unicode.GetString(Convert.FromBase64String(config.GetValue(CONST_SETTINGS, CONST_ID2Manager_Connect)));
50
                    //MarkusConnectionStr = Encoding.Unicode.GetString(Convert.FromBase64String(config.GetValue(CONST_SETTINGS, CONST_Markus_Connect)));
51
                    ID2ProjectsPath = config.GetValue(CONST_SETTINGS, CONST_ID2ProjectsPath);
52
                    MarkusImagePath = config.GetValue(CONST_SETTINGS, CONST_MarkusImagePath);
53
                    Resolution = config.GetValue(CONST_SETTINGS, CONST_Resolution, 250);
54
                    FontPath = config.GetValue(CONST_SETTINGS, CONST_FontPath);
55

  
56
                    if (args.Length > 0)
57
                    {
58
                        if (args[0].Contains(".dwg"))
59
                        {
60
                            Show(args[0]);
61
                        }
62
                    }
63
                    else
64
                    {
65
                        InitConvertPDF();
66
                    }
67
                }
68
                /********************************************************************/
69
                /* Display the error                                                */
70
                /********************************************************************/
71
                catch (System.Exception e)
72
                {
73
                    bSuccess = false;
74
                    Console.WriteLine("Teigha?NET for .dwg files Error: " + e.Message);
75
                }
44 76

  
77
                if (bSuccess)
78
                    Console.WriteLine("OdReadExMgd Finished Successfully");
79
            }
45 80
            Console.WriteLine("완료");
46 81
            Console.ReadKey();
47 82
        }
......
56 91
            }
57 92
        }
58 93

  
94
        static void Show(string dwgFile)
95
        {
96
            using (Database pDb = new Database(false, true))
97
            {
98
                pDb.ReadDwgFile(dwgFile, FileShare.Read, true, "");
99
                HostApplicationServices.WorkingDatabase = pDb;
100
                /****************************************************************/
101
                /* Display the File Version                                     */
102
                /****************************************************************/
103
                Console.WriteLine("File Version: {0}", pDb.OriginalFileVersion);
104
                /****************************************************************/
105
                /* Dump the database                                            */
106
                /****************************************************************/
107
                DbDumper dumper = new DbDumper();
108

  
109
                //dumper.prepareDump(pDb);
110
                dumper.ExplodeAndPurgeNestedBlocks(pDb);
111

  
112
                int width = 9600;
113
                int height = 6787;
114

  
115
                dumper.Show(pDb, width, height);
116
            }
117
        }
118

  
59 119
        static void InitConvertPDF()
60 120
        {
61 121
            foreach (var code in ProjectCodes())
62 122
            {
63
                ConvertPDF(code);
123
                ConvertDWG(code);
64 124
            }
65 125
        }
66 126

  
67
        static void ConvertPDF(string code)
127
        static void ConvertDWG(string code)
68 128
        {
69
            string sourcePath = Path.Combine(Path.Combine(ID2ProjectsPath, code), "drawings");
129
            string sourcePath = Path.Combine(Path.Combine(Path.Combine(ID2ProjectsPath, code), "drawings"),"Native");
70 130
            string targetPath = Path.Combine(MarkusImagePath, code);
71 131

  
72
            if(!Directory.Exists(targetPath))
132
            if (!Directory.Exists(targetPath))
73 133
                Directory.CreateDirectory(targetPath);
74 134

  
75 135
            using (MarkusRepository rep = new MarkusRepository(MarkusConnectionStr))
......
80 140
                {
81 141
                    try
82 142
                    {
83
                        var pdfFile = Path.Combine(sourcePath, item.DOCUMENT_URL);
143
                        var orgFile = Path.Combine(sourcePath, item.DOCUMENT_ID + ".dwg");
144
                        var dwgFile = Path.Combine(targetPath, item.DOCUMENT_ID + ".dwg");
84 145

  
85
                        using (Markus.MarkusPDF markusPDF = new Markus.MarkusPDF())
86
                        {
87
                            markusPDF.pdfLoad(pdfFile, -1, Resolution, FontPath);
146
                        File.Copy(orgFile, dwgFile,true);
88 147

  
89
                            if (markusPDF.PageCount() > 0)
148
                        using (Database pDb = new Database(false, true))
149
                        {
150
                            pDb.ReadDwgFile(dwgFile, FileShare.Read, true, "");
151
                            HostApplicationServices.WorkingDatabase = pDb;
152
                            /****************************************************************/
153
                            /* Display the File Version                                     */
154
                            /****************************************************************/
155
                            Console.WriteLine("File Version: {0}", pDb.OriginalFileVersion);
156
                            /****************************************************************/
157
                            /* Dump the database                                            */
158
                            /****************************************************************/
159
                            DbDumper dumper = new DbDumper();
160
                            
161
                            //dumper.prepareDump(pDb);
162
                            dumper.ExplodeAndPurgeNestedBlocks(pDb);
163

  
164
                            var pngFile = Path.Combine(targetPath, item.DOCUMENT_ID + ".png");
165
                                
166
                            int width = 9600;
167
                            int height = 6787;
168
                            
169
                            if (dumper.ExportPNG(pDb, pngFile, width, height))
90 170
                            {
91
                                var saveFileName = Path.Combine(targetPath, item.DOCUMENT_ID + ".png");
92
                                var result = markusPDF.SavePage(1, saveFileName);
93

  
94
                                if (result.StatusCode == Markus.Message.StatusCodeType.Completed)
95
                                {
96
                                    var docInfoID = rep.CreateDocInfo(item.ID, 1);
97

  
98
                                    var docPageResult = rep.CreateDocPage(new[]{
99
                                                new DocPage {
100
                                                    docinfo_id = docInfoID,
101
                                                    page_angle = 0,
102
                                                    page_width  = result.SavePageInfo.Width.ToString(),
103
                                                    page_height =  result.SavePageInfo.Height.ToString(),
104
                                                    page_number = 1
105
                                                } });
106
                                }
107

  
108
                                rep.UpdateStatusAsync(item.SERVICE_ID, item.ID, (int)result.StatusCode, 1, 1, result.Message);
171
                                File.Delete(dwgFile);
172
                                
173
                                var docInfoID = rep.CreateDocInfo(item.ID, 1);
174

  
175
                                var docPageResult = rep.CreateDocPage(new[]{
176
                                            new DocPage {
177
                                                docinfo_id = docInfoID,
178
                                                page_angle = 0,
179
                                                page_width  = width.ToString(),
180
                                                page_height =  height.ToString(),
181
                                                page_number = 1
182

  
183
                                            } });
184

  
185
                                rep.UpdateStatusAsync(item.SERVICE_ID, item.ID, 4, 1, 1, null);
109 186
                                Console.WriteLine($"Ok. {item.DOCUMENT_ID}");
110 187
                            }
188
                            else
189
                            {
190
                                rep.UpdateStatusAsync(item.SERVICE_ID, item.ID, 50, 1, 1, "DWG Convert Error");
191
                                Console.WriteLine($"Error. {item.DOCUMENT_ID}");
192
                            }
111 193
                        }
112 194
                    }
113 195
                    catch (Exception ex)
114 196
                    {
115 197
                        Console.WriteLine($"Error. {item.DOCUMENT_ID} {ex.ToString()}");
116
                        rep.UpdateStatusAsync(item.SERVICE_ID, item.ID,(int)Markus.Message.StatusCodeType.Error, 1, 1, ex.ToString());
198
                        rep.UpdateStatusAsync(item.SERVICE_ID, item.ID,50, 1, 1, ex.ToString());
117 199
                    }
118 200
                }
119 201
            }

내보내기 Unified diff

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