프로젝트

일반

사용자정보

개정판 ed279b4c

IDed279b4c2eb9daaa4c40965726c3ffe09db10aa9
상위 0688f998
하위 d3a29f50

김태성이(가) 약 2년 전에 추가함

issue #00000 documents markuptext 수정

Change-Id: I94c426d7f8f33cea8f38d884802877c32718ec38

차이점 보기:

ID2.Manager/ID2.Manager.Controller/Controllers/DocumentController.cs
124 124
                                     DTIsImport = doc.DTIsImport,
125 125
                                     DTIsRegSystem = doc.DTIsRegSystem,
126 126
                                     DTRemarks = doc.DTRemarks,
127
                                     MarkupText = doc.MarkupText
127
                                     Markups = doc.Markups
128 128
                                 };
129 129

  
130 130
                    return (result, totalCnt);
ID2.Manager/ID2.Manager.Dapper/Repository/BaseRepository.cs
98 98
            return this._DbConnection.Query<T>(sql);
99 99
        }
100 100

  
101
        public IEnumerable<TReturn> MultiQuery<TFirst, TSecond, TReturn>(string sql, Func<TFirst, TSecond, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null)
102
        {
103
            if (this._DbConnection.State != ConnectionState.Open)
104
            {
105
                this._DbConnection.Open();
106
            }
107

  
108
            return this._DbConnection.Query<TFirst, TSecond,  TReturn>(sql,map: map,param:param,transaction:transaction,buffered:buffered,splitOn:splitOn,commandTimeout:commandTimeout,commandType:commandType);
109
        }
110

  
101 111
        public T QueryFirst<T>(string sql)
102 112
        {
103 113
            if (this._DbConnection.State != ConnectionState.Open)
ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
106 106
            try
107 107
            {
108 108
                string query = $@"
109
select   doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime,
110

  
111
  (
112
    select markus.*
113
	from [markus_SEC].[dbo].[ViewMarkupData] markus where doc.DocumentNo = markus.DOCUMENT_ID
114
	FOR JSON PATH
115
  ) as MarkupText
116
from     dbo.Documents doc
117
where    doc.IsDeleted=0 {sbWhere}
118
order by doc.Seq
109
                            select   doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime,
110
                            markus.*
111
                            from     dbo.Documents doc
112
                            LEFT OUTER JOIN 
113
                                    (SELECT [PROJECT_NO] as PROJECT_NO
114
                                          ,[DOCUMENT_ID] as DocumentNo
115
                                          ,[MARKUP_DATA_ID]
116
                                          ,[PAGENUMBER]
117
                                          ,[Text] as TEXT
118
                                          ,[CREATE_DATE] as CREATE_DATE
119
                                          ,[NAME] as CREATE_USER
120
                                      FROM [markus_SEC].dbo.[ViewMarkupData]) markus 
121
                            ON doc.DocumentNo = markus.DocumentNo
122
                            where    doc.IsDeleted=0 {sbWhere}
123
                            order by doc.Seq
119 124

  
120 125
select @Total=count(*) from dbo.Documents doc where doc.IsDeleted=0 {sbTotalWhere}
121 126
select @Total;";
......
125 130
                    dynamicParameters.AddDynamicParams(parameters);
126 131
                }
127 132

  
128
                var ret = Query<Documents>(query, dynamicParameters);
133
                var docDictionary = new Dictionary<string, Documents>();
134

  
135
                var ret = MultiQuery<Documents,MarkupText,Documents>(query,
136
                                (document,markusText)=>
137
                                {
138
                                    Documents doc;
139

  
140
                                    if (!docDictionary.TryGetValue(document.DocumentNo, out doc))
141
                                    {
142
                                        doc = document;
143
                                        doc.Markups = doc.Markups ?? new List<MarkupText>();
144
                                        docDictionary.Add(doc.DocumentNo, doc);
145
                                    }
146

  
147
                                    doc.Markups.Add(markusText);
148
                                    return doc;
149

  
150
                                }, dynamicParameters,splitOn: "DocumentNo").Distinct();
129 151

  
130 152
                int totalCount = dynamicParameters.Get<int>("Total");
131 153

  
ID2.Manager/ID2.Manager.Data/ID2.Manager.Data.csproj
61 61
    <Reference Include="System.Xml" />
62 62
  </ItemGroup>
63 63
  <ItemGroup>
64
    <Compile Include="HashCodeHelper.cs" />
64 65
    <Compile Include="Models\ExcelData.cs" />
65 66
    <Compile Include="Models\ExcelDataInfo.cs" />
66 67
    <Compile Include="Models\MarkupText.cs" />
ID2.Manager/ID2.Manager.Data/Models/Documents.cs
173 173
        [DataMember]
174 174
        public string DTRemarks { get; set; }
175 175

  
176
        public string MarkupText { get; set; }
176
        public List<MarkupText> Markups { get; set; }
177 177

  
178 178
        public override bool Equals(object obj)
179 179
        {
......
195 195
                && this.ProdReviewer == other.ProdReviewer && this.ProdIsResult == other.ProdIsResult && this.ProdRemarks == other.ProdRemarks && this.ClientReviewer == other.ClientReviewer
196 196
                && this.ClientIsResult == other.ClientIsResult && this.ClientRemarks == other.ClientRemarks && this.DTIsGateWay == other.DTIsGateWay && this.DTIsImport == other.DTIsImport
197 197
                && this.DTIsRegSystem == other.DTIsRegSystem && this.DTRemarks == other.DTRemarks
198
                && this.MarkupText == other.MarkupText;
198
                && this.Markups == other.Markups;
199 199

  
200 200
        }
201 201
        public override int GetHashCode()
202 202
        {
203
            return this.DocumentNo.GetHashCode() + this.RevisonNo.GetHashCode() + this.RefProjectCode.GetHashCode() + this.IsLatest.GetHashCode()
204
                + this.AutoCADFilie.GetHashCode() + this.PDFFile.GetHashCode() + this.MarkupLink.GetHashCode() + this.AVEVALink.GetHashCode()
205
                + this.DocFilePath.GetHashCode() + this.DocFileName.GetHashCode() + this.JobLevel.GetHashCode() + this.IsTypical.GetHashCode()
206
                + this.PersonInCharge.GetHashCode() + this.IsDeleted.GetHashCode() + this.ToIsDiscussion.GetHashCode() + this.ToRemarks.GetHashCode()
207
                + this.ToCreator.GetHashCode() + this.ToCapture.GetHashCode() + this.ToIsMarkup.GetHashCode()
208
                + this.FrReviewStatus.GetHashCode() + this.FrRemarks.GetHashCode() + this.FrCreator.GetHashCode()
209
                + this.FrCapture.GetHashCode() + this.FrIsMarkup.GetHashCode() + this.IsID2Work.GetHashCode() + this.ID2Connection.GetHashCode()
210
                + this.ID2StartDate.GetHashCode() + this.ID2EndDate.GetHashCode() + this.ID2JobTime.GetHashCode() + this.ID2Status.GetHashCode()
211
                + this.ID2Issues.GetHashCode() + this.AVEVAConnection.GetHashCode() + this.AVEVAConvertDate.GetHashCode() + this.AVEVAReviewDate.GetHashCode()
212
                + this.AVEVAStatus.GetHashCode() + this.AVEVAIssues.GetHashCode() + this.ReviewFilePath.GetHashCode() + this.ReviewFileName.GetHashCode()
213
                + this.ProdReviewer.GetHashCode() + this.ProdIsResult.GetHashCode() + this.ProdRemarks.GetHashCode() + this.ClientReviewer.GetHashCode()
214
                + this.ClientIsResult.GetHashCode() + this.ClientRemarks.GetHashCode() + this.DTIsGateWay.GetHashCode() + this.DTIsImport.GetHashCode()
215
                + this.DTIsRegSystem.GetHashCode() + this.DTRemarks.GetHashCode()
216
                + this.MarkupText.GetHashCode();
203
            return this.DocumentNo.GetNullableHash() + this.RevisonNo.GetNullableHash() + this.RefProjectCode.GetNullableHash() + this.IsLatest.GetNullableHash()
204
                + this.AutoCADFilie.GetNullableHash() + this.PDFFile.GetNullableHash() + this.MarkupLink.GetNullableHash() + this.AVEVALink.GetNullableHash()
205
                + this.DocFilePath.GetNullableHash() + this.DocFileName.GetNullableHash() + this.JobLevel.GetNullableHash() + this.IsTypical.GetNullableHash()
206
                + this.PersonInCharge.GetNullableHash() + this.IsDeleted.GetNullableHash() + this.ToIsDiscussion.GetNullableHash() + this.ToRemarks.GetNullableHash()
207
                + this.ToCreator.GetNullableHash() + this.ToCapture.GetNullableHash() + this.ToIsMarkup.GetNullableHash()
208
                + this.FrReviewStatus.GetNullableHash() + this.FrRemarks.GetNullableHash() + this.FrCreator.GetNullableHash()
209
                + this.FrCapture.GetNullableHash() + this.FrIsMarkup.GetNullableHash() + this.IsID2Work.GetNullableHash() + this.ID2Connection.GetNullableHash()
210
                + this.ID2StartDate.GetNullableHash() + this.ID2EndDate.GetNullableHash() + this.ID2JobTime.GetNullableHash() + this.ID2Status.GetNullableHash()
211
                + this.ID2Issues.GetNullableHash() + this.AVEVAConnection.GetNullableHash() + this.AVEVAConvertDate.GetNullableHash() + this.AVEVAReviewDate.GetNullableHash()
212
                + this.AVEVAStatus.GetNullableHash() + this.AVEVAIssues.GetNullableHash() + this.ReviewFilePath.GetNullableHash() + this.ReviewFileName.GetNullableHash()
213
                + this.ProdReviewer.GetNullableHash() + this.ProdIsResult.GetNullableHash() + this.ProdRemarks.GetNullableHash() + this.ClientReviewer.GetNullableHash()
214
                + this.ClientIsResult.GetNullableHash() + this.ClientRemarks.GetNullableHash() + this.DTIsGateWay.GetNullableHash() + this.DTIsImport.GetNullableHash()
215
                + this.DTIsRegSystem.GetNullableHash() + this.DTRemarks.GetNullableHash()
216
                + this.Markups.GetNullableHash();
217 217
        }
218 218

  
219 219
        public class DocumentsKeyComparer : IEqualityComparer<Documents>
ID2.Manager/ID2.Manager.Data/Models/MarkupText.cs
11 11
    {
12 12
        public string PROJECT_NO { get; set; }
13 13

  
14
        public string NAME { get; set; }
14
        public string CREATE_USER { get; set; }
15 15

  
16
        public string DOCUMENT_ID { get; set; }
16
        public string DocumentNo { get; set; }
17 17

  
18 18
        public string TEXT { get; set; }
19 19
        public DateTime CREATE_DATE { get; set; }
......
21 21

  
22 22
        public bool Equals(MarkupText other)
23 23
        {
24
            return other != null 
25
                &&  NAME == other.NAME 
24
            return other != null
25
                && PROJECT_NO == other.PROJECT_NO
26
                && CREATE_USER == other.CREATE_USER
26 27
                &&  TEXT == other.TEXT 
27 28
                &&  CREATE_DATE == other.CREATE_DATE 
28
                &&  DOCUMENT_ID == other.DOCUMENT_ID;
29
                && DocumentNo == other.DocumentNo;
29 30
        }
30 31

  
31 32
        public override int GetHashCode()
32 33
        {
33
            return this.TEXT.GetHashCode() + this.CREATE_DATE.GetHashCode() + NAME.GetHashCode() + DOCUMENT_ID.GetHashCode();
34
            return this.CREATE_USER.GetNullableHash() + this.TEXT.GetNullableHash() + this.CREATE_DATE.GetNullableHash() + PROJECT_NO.GetNullableHash() + DocumentNo.GetNullableHash();
34 35
        }
35 36

  
36 37

  
ID2.Manager/ID2.Manager/Controls/MarkupDetailCellElement.cs
113 113
                //if (!IsBinding)
114 114
                //{
115 115
                List<Markup> markups = new List<Markup>();
116
                var markup = (this.HierarchyRow.DataBoundItem as ID2.Manager.Data.Models.Documents).MarkupText;
116
                var markup = (this.HierarchyRow.DataBoundItem as ID2.Manager.Data.Models.Documents).Markups;
117 117

  
118 118
                listView.DataSource = null;
119 119

  
120
                if (!string.IsNullOrWhiteSpace(markup))
121
                {
122
                    var items = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Markup>>(markup);
123
                    listView.DataSource = items;
120
                //if (!string.IsNullOrWhiteSpace(markup))
121
                //{
122
                //    var items = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Markup>>(markup);
123
                //    listView.DataSource = items;
124 124
                 
125
                    listView.SelectedItem = null;
126
                //this.Focus();
127
                    listView.BestFitColumns(ListViewBestFitColumnMode.DataCells);
128
                }
129
                else
130
                {
131
                    this.Text = "null";
132
                }
125
                //    listView.SelectedItem = null;
126
                ////this.Focus();
127
                //    listView.BestFitColumns(ListViewBestFitColumnMode.DataCells);
128
                //}
129
                //else
130
                //{
131
                //    this.Text = "null";
132
                //}
133 133
            //}
134 134
                //IsBinding = true;
135 135
            //}
ID2.Manager/ID2.Manager/Main.Designer.cs
74 74
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn20 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
75 75
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn21 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
76 76
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn10 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
77
            Telerik.WinControls.UI.TableViewDefinition tableViewDefinition2 = new Telerik.WinControls.UI.TableViewDefinition();
77
            Telerik.WinControls.UI.TableViewDefinition tableViewDefinition1 = new Telerik.WinControls.UI.TableViewDefinition();
78 78
            Telerik.WinControls.UI.GridViewRelation gridViewRelation1 = new Telerik.WinControls.UI.GridViewRelation();
79 79
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
80
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn11 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
81
            Telerik.WinControls.UI.TableViewDefinition tableViewDefinition1 = new Telerik.WinControls.UI.TableViewDefinition();
82 80
            this.ID2ManagerRadRibbonBar = new Telerik.WinControls.UI.RadRibbonBar();
83 81
            this.radRibbonBarBackstageViewID2Manager = new Telerik.WinControls.UI.RadRibbonBarBackstageView();
84 82
            this.backstageViewPageOpenProject = new Telerik.WinControls.UI.BackstageViewPage();
......
136 134
            this.radCheckBox1 = new Telerik.WinControls.UI.RadCheckBox();
137 135
            this.tableLayoutMain = new System.Windows.Forms.TableLayoutPanel();
138 136
            this.radGridViewDocuments = new Telerik.WinControls.UI.RadGridView();
139
            this.DetailViewTemplate = new Telerik.WinControls.UI.GridViewTemplate();
140 137
            this.radCommandBar1 = new Telerik.WinControls.UI.RadCommandBar();
141 138
            this.commandBarRowSearch = new Telerik.WinControls.UI.CommandBarRowElement();
142 139
            this.commandBarSearch = new Telerik.WinControls.UI.CommandBarStripElement();
......
209 206
            this.tableLayoutMain.SuspendLayout();
210 207
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments)).BeginInit();
211 208
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments.MasterTemplate)).BeginInit();
212
            ((System.ComponentModel.ISupportInitialize)(this.DetailViewTemplate)).BeginInit();
213 209
            ((System.ComponentModel.ISupportInitialize)(this.radCommandBar1)).BeginInit();
214 210
            ((System.ComponentModel.ISupportInitialize)(this.splitPanelRight)).BeginInit();
215 211
            this.splitPanelRight.SuspendLayout();
......
451 447
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
452 448
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
453 449
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
454
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 86F));
450
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 90F));
455 451
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
456 452
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 1);
457 453
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 1);
......
496 492
            this.radDropDownListFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
497 493
            this.radDropDownListFrReviewStatus.DropDownAnimationEnabled = true;
498 494
            this.radDropDownListFrReviewStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
499
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(342, 32);
495
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(341, 32);
500 496
            this.radDropDownListFrReviewStatus.Name = "radDropDownListFrReviewStatus";
501
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(108, 20);
497
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(107, 20);
502 498
            this.radDropDownListFrReviewStatus.TabIndex = 18;
503 499
            // 
504 500
            // radDropDownListToIsDiscussion
......
508 504
            this.radDropDownListToIsDiscussion.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
509 505
            this.radDropDownListToIsDiscussion.Location = new System.Drawing.Point(141, 32);
510 506
            this.radDropDownListToIsDiscussion.Name = "radDropDownListToIsDiscussion";
511
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(108, 20);
507
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(107, 20);
512 508
            this.radDropDownListToIsDiscussion.TabIndex = 17;
513 509
            // 
514 510
            // radLabelFrReviewStatus
515 511
            // 
516 512
            this.radLabelFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
517 513
            this.radLabelFrReviewStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
518
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(256, 34);
514
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(255, 34);
519 515
            this.radLabelFrReviewStatus.Name = "radLabelFrReviewStatus";
520 516
            this.radLabelFrReviewStatus.Size = new System.Drawing.Size(59, 17);
521 517
            this.radLabelFrReviewStatus.TabIndex = 7;
......
545 541
            // 
546 542
            this.radLabelAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
547 543
            this.radLabelAVEVAStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
548
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(256, 62);
544
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(255, 62);
549 545
            this.radLabelAVEVAStatus.Name = "radLabelAVEVAStatus";
550 546
            this.radLabelAVEVAStatus.Size = new System.Drawing.Size(86, 17);
551 547
            this.radLabelAVEVAStatus.TabIndex = 8;
......
555 551
            // 
556 552
            this.radLabelIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
557 553
            this.radLabelIsID2Work.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
558
            this.radLabelIsID2Work.Location = new System.Drawing.Point(457, 34);
554
            this.radLabelIsID2Work.Location = new System.Drawing.Point(455, 34);
559 555
            this.radLabelIsID2Work.Name = "radLabelIsID2Work";
560 556
            this.radLabelIsID2Work.Size = new System.Drawing.Size(80, 17);
561 557
            this.radLabelIsID2Work.TabIndex = 6;
......
565 561
            // 
566 562
            this.radLabelJobLevel.Anchor = System.Windows.Forms.AnchorStyles.Left;
567 563
            this.radLabelJobLevel.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
568
            this.radLabelJobLevel.Location = new System.Drawing.Point(457, 6);
564
            this.radLabelJobLevel.Location = new System.Drawing.Point(455, 6);
569 565
            this.radLabelJobLevel.Name = "radLabelJobLevel";
570 566
            this.radLabelJobLevel.Size = new System.Drawing.Size(47, 17);
571 567
            this.radLabelJobLevel.TabIndex = 7;
......
616 612
            this.radButtonSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
617 613
            this.radButtonSearch.Cursor = System.Windows.Forms.Cursors.Hand;
618 614
            this.radButtonSearch.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
619
            this.radButtonSearch.Location = new System.Drawing.Point(873, 4);
615
            this.radButtonSearch.Location = new System.Drawing.Point(871, 4);
620 616
            this.radButtonSearch.Name = "radButtonSearch";
621 617
            this.tableLayoutPanelCondition.SetRowSpan(this.radButtonSearch, 4);
622 618
            this.radButtonSearch.Size = new System.Drawing.Size(54, 106);
......
630 626
            this.radDropDownListProject.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
631 627
            this.radDropDownListProject.Location = new System.Drawing.Point(141, 4);
632 628
            this.radDropDownListProject.Name = "radDropDownListProject";
633
            this.radDropDownListProject.Size = new System.Drawing.Size(108, 20);
629
            this.radDropDownListProject.Size = new System.Drawing.Size(107, 20);
634 630
            this.radDropDownListProject.TabIndex = 7;
635 631
            // 
636 632
            // radLabelDocumentNo
637 633
            // 
638 634
            this.radLabelDocumentNo.Anchor = System.Windows.Forms.AnchorStyles.Left;
639 635
            this.radLabelDocumentNo.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
640
            this.radLabelDocumentNo.Location = new System.Drawing.Point(658, 6);
636
            this.radLabelDocumentNo.Location = new System.Drawing.Point(655, 6);
641 637
            this.radLabelDocumentNo.Name = "radLabelDocumentNo";
642 638
            this.radLabelDocumentNo.Size = new System.Drawing.Size(49, 17);
643 639
            this.radLabelDocumentNo.TabIndex = 6;
......
646 642
            // radTextBoxDocumentNo
647 643
            // 
648 644
            this.radTextBoxDocumentNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
649
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(744, 4);
645
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(741, 4);
650 646
            this.radTextBoxDocumentNo.Name = "radTextBoxDocumentNo";
651
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(108, 20);
647
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(107, 20);
652 648
            this.radTextBoxDocumentNo.TabIndex = 8;
653 649
            // 
654 650
            // radLabelPersonInCharge
655 651
            // 
656 652
            this.radLabelPersonInCharge.Anchor = System.Windows.Forms.AnchorStyles.Left;
657 653
            this.radLabelPersonInCharge.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
658
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(256, 6);
654
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(255, 6);
659 655
            this.radLabelPersonInCharge.Name = "radLabelPersonInCharge";
660 656
            this.radLabelPersonInCharge.Size = new System.Drawing.Size(47, 17);
661 657
            this.radLabelPersonInCharge.TabIndex = 6;
......
666 662
            this.radDropDownListPersonInCharge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
667 663
            this.radDropDownListPersonInCharge.DropDownAnimationEnabled = true;
668 664
            this.radDropDownListPersonInCharge.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
669
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(342, 4);
665
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(341, 4);
670 666
            this.radDropDownListPersonInCharge.Name = "radDropDownListPersonInCharge";
671
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(108, 20);
667
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(107, 20);
672 668
            this.radDropDownListPersonInCharge.TabIndex = 9;
673 669
            // 
674 670
            // radLabel1
......
686 682
            this.radDropDownListJobLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
687 683
            this.radDropDownListJobLevel.DropDownAnimationEnabled = true;
688 684
            this.radDropDownListJobLevel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
689
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(543, 4);
685
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(541, 4);
690 686
            this.radDropDownListJobLevel.Name = "radDropDownListJobLevel";
691
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(108, 20);
687
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(107, 20);
692 688
            this.radDropDownListJobLevel.TabIndex = 11;
693 689
            // 
694 690
            // radLabelID2Status
......
705 701
            // 
706 702
            this.radLabel10.Anchor = System.Windows.Forms.AnchorStyles.Left;
707 703
            this.radLabel10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
708
            this.radLabel10.Location = new System.Drawing.Point(256, 90);
704
            this.radLabel10.Location = new System.Drawing.Point(255, 90);
709 705
            this.radLabel10.Name = "radLabel10";
710 706
            this.radLabel10.Size = new System.Drawing.Size(61, 17);
711 707
            this.radLabel10.TabIndex = 9;
......
716 712
            this.radDropDownListIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
717 713
            this.radDropDownListIsID2Work.DropDownAnimationEnabled = true;
718 714
            this.radDropDownListIsID2Work.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
719
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(543, 32);
715
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(541, 32);
720 716
            this.radDropDownListIsID2Work.Name = "radDropDownListIsID2Work";
721
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(108, 20);
717
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(107, 20);
722 718
            this.radDropDownListIsID2Work.TabIndex = 12;
723 719
            // 
724 720
            // radDropDownListID2Status
......
728 724
            this.radDropDownListID2Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
729 725
            this.radDropDownListID2Status.Location = new System.Drawing.Point(141, 60);
730 726
            this.radDropDownListID2Status.Name = "radDropDownListID2Status";
731
            this.radDropDownListID2Status.Size = new System.Drawing.Size(108, 20);
727
            this.radDropDownListID2Status.Size = new System.Drawing.Size(107, 20);
732 728
            this.radDropDownListID2Status.TabIndex = 13;
733 729
            // 
734 730
            // radDropDownListAVEVAStatus
......
736 732
            this.radDropDownListAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
737 733
            this.radDropDownListAVEVAStatus.DropDownAnimationEnabled = true;
738 734
            this.radDropDownListAVEVAStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
739
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(342, 60);
735
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(341, 60);
740 736
            this.radDropDownListAVEVAStatus.Name = "radDropDownListAVEVAStatus";
741
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(108, 20);
737
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(107, 20);
742 738
            this.radDropDownListAVEVAStatus.TabIndex = 14;
743 739
            // 
744 740
            // radDropDownListProdIsResult
......
748 744
            this.radDropDownListProdIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
749 745
            this.radDropDownListProdIsResult.Location = new System.Drawing.Point(141, 89);
750 746
            this.radDropDownListProdIsResult.Name = "radDropDownListProdIsResult";
751
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(108, 20);
747
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(107, 20);
752 748
            this.radDropDownListProdIsResult.TabIndex = 15;
753 749
            // 
754 750
            // radDropDownListClientIsResult
......
756 752
            this.radDropDownListClientIsResult.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
757 753
            this.radDropDownListClientIsResult.DropDownAnimationEnabled = true;
758 754
            this.radDropDownListClientIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
759
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(342, 89);
755
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(341, 89);
760 756
            this.radDropDownListClientIsResult.Name = "radDropDownListClientIsResult";
761
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(108, 20);
757
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(107, 20);
762 758
            this.radDropDownListClientIsResult.TabIndex = 16;
763 759
            // 
764 760
            // tableLayoutPanelGroup
......
1199 1195
            this.radGridViewDocuments.MasterTemplate.EnableFiltering = true;
1200 1196
            this.radGridViewDocuments.MasterTemplate.ShowFilteringRow = false;
1201 1197
            this.radGridViewDocuments.MasterTemplate.ShowHeaderCellButtons = true;
1202
            this.radGridViewDocuments.MasterTemplate.Templates.AddRange(new Telerik.WinControls.UI.GridViewTemplate[] {
1203
            this.DetailViewTemplate});
1204
            this.radGridViewDocuments.MasterTemplate.ViewDefinition = tableViewDefinition2;
1198
            this.radGridViewDocuments.MasterTemplate.ViewDefinition = tableViewDefinition1;
1205 1199
            this.radGridViewDocuments.Name = "radGridViewDocuments";
1206 1200
            gridViewRelation1.ChildColumnNames = ((System.Collections.Specialized.StringCollection)(resources.GetObject("gridViewRelation1.ChildColumnNames")));
1207 1201
            gridViewRelation1.ParentColumnNames = ((System.Collections.Specialized.StringCollection)(resources.GetObject("gridViewRelation1.ParentColumnNames")));
......
1212 1206
            this.radGridViewDocuments.Size = new System.Drawing.Size(944, 325);
1213 1207
            this.radGridViewDocuments.TabIndex = 0;
1214 1208
            // 
1215
            // DetailViewTemplate
1216
            // 
1217
            gridViewTextBoxColumn11.EnableExpressionEditor = false;
1218
            gridViewTextBoxColumn11.FieldName = "MarkupText";
1219
            gridViewTextBoxColumn11.HeaderText = "MarkupText";
1220
            gridViewTextBoxColumn11.Name = "MarkupText";
1221
            this.DetailViewTemplate.Columns.AddRange(new Telerik.WinControls.UI.GridViewDataColumn[] {
1222
            gridViewTextBoxColumn11});
1223
            this.DetailViewTemplate.EnableAlternatingRowColor = true;
1224
            this.DetailViewTemplate.ViewDefinition = tableViewDefinition1;
1225
            // 
1226 1209
            // radCommandBar1
1227 1210
            // 
1228 1211
            this.radCommandBar1.Dock = System.Windows.Forms.DockStyle.Top;
......
1606 1589
            this.tableLayoutMain.PerformLayout();
1607 1590
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments.MasterTemplate)).EndInit();
1608 1591
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments)).EndInit();
1609
            ((System.ComponentModel.ISupportInitialize)(this.DetailViewTemplate)).EndInit();
1610 1592
            ((System.ComponentModel.ISupportInitialize)(this.radCommandBar1)).EndInit();
1611 1593
            ((System.ComponentModel.ISupportInitialize)(this.splitPanelRight)).EndInit();
1612 1594
            this.splitPanelRight.ResumeLayout(false);
......
1701 1683
        private Telerik.WinControls.UI.CommandBarSeparator commandBarSeparator1;
1702 1684
        private Telerik.WinControls.UI.CommandBarSeparator commandBarSeparator2;
1703 1685
        private Telerik.WinControls.UI.CommandBarHostItem btnShowAllDetail;
1704
        private Telerik.WinControls.UI.GridViewTemplate DetailViewTemplate;
1705 1686
        private Telerik.WinControls.UI.SplitPanel splitPanel3;
1706 1687
        private Telerik.WinControls.UI.RadPageView radPageViewViewer;
1707 1688
        private Telerik.WinControls.UI.RadPageViewPage radPageViewPageAutoCAD;

내보내기 Unified diff

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