프로젝트

일반

사용자정보

개정판 e458a996

IDe458a9964db863a6c2e83e6fb2b7d72d1248880f
상위 1671c27d
하위 9d3fbdce

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

issue #0000 소스 복구

Change-Id: I3fbe27e09e119bac3f1ec3409ff77c58d7d2f13c

차이점 보기:

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)
......
115 125
                this._DbConnection.Open();
116 126
            }
117 127

  
118
            return this._DbConnection.QueryFirstOrDefault<T>(sql, param, transaction : dbTran);
128
            return this._DbConnection.QueryFirstOrDefault<T>(sql, param, transaction: dbTran);
119 129
        }
120 130

  
121 131

  
......
128 138

  
129 139
            return this._DbConnection.Query<T>(sql, param);
130 140
        }
131
        public IEnumerable<T> Query<T>(string sql, object param,CommandType commandType)
141
        public IEnumerable<T> Query<T>(string sql, object param, CommandType commandType)
132 142
        {
133 143
            if (this._DbConnection.State != ConnectionState.Open)
134 144
            {
135 145
                this._DbConnection.Open();
136 146
            }
137 147

  
138
            return this._DbConnection.Query<T>(sql, param,commandType: commandType);
148
            return this._DbConnection.Query<T>(sql, param, commandType: commandType);
139 149
        }
140 150

  
141 151
        public async Task<IEnumerable<T>> QueryAsync<T>(string sql)
ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
131 131
            try
132 132
            {
133 133
                string query = $@"
134
select   doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime,
135

  
136
  (
137
    select markus.*
138
	from [markus_SEC].[dbo].[ViewMarkupData] markus where doc.DocumentNo = markus.DOCUMENT_ID
139
	FOR JSON PATH
140
  ) as MarkupText
141
from     dbo.Documents doc
142
where    doc.IsDeleted=0 {sbWhere}
143
order by doc.Seq
134
                            select   doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime,
135
                            markus.*
136
                            from     dbo.Documents doc
137
                            LEFT OUTER JOIN 
138
                                    (SELECT [PROJECT_NO] as PROJECT_NO
139
                                          ,[DOCUMENT_ID] as DocumentNo
140
                                          ,[MARKUP_DATA_ID]
141
                                          ,[PAGENUMBER]
142
                                          ,[Text] as TEXT
143
                                          ,[CREATE_DATE] as CREATE_DATE
144
                                          ,[NAME] as CREATE_USER
145
                                      FROM [markus_SEC].dbo.[ViewMarkupData]) markus 
146
                            ON doc.DocumentNo = markus.DocumentNo
147
                            where    doc.IsDeleted=0 {sbWhere}
148
                            order by doc.Seq
144 149

  
145 150
select @Total=count(*) from dbo.Documents doc where doc.IsDeleted=0 {sbTotalWhere}
146 151
select @Total;";
......
150 155
                    dynamicParameters.AddDynamicParams(parameters);
151 156
                }
152 157

  
153
                var ret = Query<Documents>(query, dynamicParameters);
158
                var docDictionary = new Dictionary<string, Documents>();
159

  
160
                var ret = MultiQuery<Documents, MarkupText, Documents>(query,
161
                                (document, markusText) =>
162
                                {
163
                                    Documents doc;
164

  
165
                                    if (!docDictionary.TryGetValue(document.DocumentNo, out doc))
166
                                    {
167
                                        doc = document;
168
                                        doc.Markups = doc.Markups ?? new List<MarkupText>();
169
                                        docDictionary.Add(doc.DocumentNo, doc);
170
                                    }
171

  
172
                                    doc.Markups.Add(markusText);
173
                                    return doc;
174

  
175
                                }, dynamicParameters, splitOn: "DocumentNo").Distinct();
154 176

  
155 177
                int totalCount = dynamicParameters.Get<int>("Total");
156 178

  
......
457 479
update dbo.Documents
458 480
set    ModifiedDate=getdate() {sbSet}
459 481
where  [DocID]=@DocID;";
460
                                 base.Execute(query, parameters, transaction);
482
                                base.Execute(query, parameters, transaction);
461 483
                            }
462 484
                        }
463 485
                    }
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>
......
241 241
    public class ID2Drawings
242 242
    {
243 243
        [DataMember]
244
        public string PROJECTNAME { get; set; }        
244
        public string PROJECTNAME { get; set; }
245 245
        [DataMember]
246 246
        public string UID { get; set; }
247 247
        [DataMember]
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 
26
                &&  TEXT == other.TEXT 
27
                &&  CREATE_DATE == other.CREATE_DATE 
28
                &&  DOCUMENT_ID == other.DOCUMENT_ID;
24
            return other != null
25
                && PROJECT_NO == other.PROJECT_NO
26
                && CREATE_USER == other.CREATE_USER
27
                && TEXT == other.TEXT
28
                && CREATE_DATE == other.CREATE_DATE
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
114 114
                //if (!IsBinding)
115 115
                //{
116 116
                List<Markup> markups = new List<Markup>();
117
                var markup = (this.HierarchyRow.DataBoundItem as ID2.Manager.Data.Models.Documents).MarkupText;
117
                var markup = (this.HierarchyRow.DataBoundItem as ID2.Manager.Data.Models.Documents).Markups;
118 118

  
119
                listView.DataSource = null;
119
                listView.DataSource = markup;
120 120

  
121
                if (!string.IsNullOrWhiteSpace(markup))
122
                {
123
                    var items = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Markup>>(markup);
124
                    listView.DataSource = items;
121
                //if (!string.IsNullOrWhiteSpace(markup))
122
                //{
123
                //    var items = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Markup>>(markup);
124
                //    listView.DataSource = items;
125 125
                 
126
                    listView.SelectedItem = null;
127
                //this.Focus();
128
                    listView.BestFitColumns(ListViewBestFitColumnMode.DataCells);
129
                }
130
                else
131
                {
132
                    this.Text = "null";
133
                }
126
                //    listView.SelectedItem = null;
127
                ////this.Focus();
128
                //    listView.BestFitColumns(ListViewBestFitColumnMode.DataCells);
129
                //}
130
                //else
131
                //{
132
                //    this.Text = "null";
133
                //}
134 134
            //}
135 135
                //IsBinding = true;
136 136
            //}
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();
......
142 140
            this.radCheckBox1 = new Telerik.WinControls.UI.RadCheckBox();
143 141
            this.tableLayoutMain = new System.Windows.Forms.TableLayoutPanel();
144 142
            this.radGridViewDocuments = new Telerik.WinControls.UI.RadGridView();
145
            this.DetailViewTemplate = new Telerik.WinControls.UI.GridViewTemplate();
146 143
            this.radCommandBar1 = new Telerik.WinControls.UI.RadCommandBar();
147 144
            this.commandBarRowSearch = new Telerik.WinControls.UI.CommandBarRowElement();
148 145
            this.commandBarSearch = new Telerik.WinControls.UI.CommandBarStripElement();
......
220 217
            this.tableLayoutMain.SuspendLayout();
221 218
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments)).BeginInit();
222 219
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments.MasterTemplate)).BeginInit();
223
            ((System.ComponentModel.ISupportInitialize)(this.DetailViewTemplate)).BeginInit();
224 220
            ((System.ComponentModel.ISupportInitialize)(this.radCommandBar1)).BeginInit();
225 221
            ((System.ComponentModel.ISupportInitialize)(this.splitPanelRight)).BeginInit();
226 222
            this.splitPanelRight.SuspendLayout();
......
468 464
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
469 465
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
470 466
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
471
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 61F));
467
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 65F));
472 468
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 1);
473 469
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 1);
474 470
            this.tableLayoutPanelCondition.Controls.Add(this.radLabelFrReviewStatus, 3, 1);
......
518 514
            this.radDropDownListFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
519 515
            this.radDropDownListFrReviewStatus.DropDownAnimationEnabled = true;
520 516
            this.radDropDownListFrReviewStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
521
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(352, 34);
517
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(351, 34);
522 518
            this.radDropDownListFrReviewStatus.Name = "radDropDownListFrReviewStatus";
523
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(113, 20);
519
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(112, 20);
524 520
            this.radDropDownListFrReviewStatus.TabIndex = 18;
525 521
            // 
526 522
            // radDropDownListToIsDiscussion
......
530 526
            this.radDropDownListToIsDiscussion.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
531 527
            this.radDropDownListToIsDiscussion.Location = new System.Drawing.Point(146, 34);
532 528
            this.radDropDownListToIsDiscussion.Name = "radDropDownListToIsDiscussion";
533
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(113, 20);
529
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(112, 20);
534 530
            this.radDropDownListToIsDiscussion.TabIndex = 17;
535 531
            // 
536 532
            // radLabelFrReviewStatus
537 533
            // 
538 534
            this.radLabelFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
539 535
            this.radLabelFrReviewStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
540
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(266, 35);
536
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(265, 35);
541 537
            this.radLabelFrReviewStatus.Name = "radLabelFrReviewStatus";
542 538
            this.radLabelFrReviewStatus.Size = new System.Drawing.Size(59, 17);
543 539
            this.radLabelFrReviewStatus.TabIndex = 7;
......
567 563
            // 
568 564
            this.radLabelAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
569 565
            this.radLabelAVEVAStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
570
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(266, 64);
566
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(265, 64);
571 567
            this.radLabelAVEVAStatus.Name = "radLabelAVEVAStatus";
572 568
            this.radLabelAVEVAStatus.Size = new System.Drawing.Size(86, 17);
573 569
            this.radLabelAVEVAStatus.TabIndex = 8;
......
577 573
            // 
578 574
            this.radLabelIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
579 575
            this.radLabelIsID2Work.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
580
            this.radLabelIsID2Work.Location = new System.Drawing.Point(472, 35);
576
            this.radLabelIsID2Work.Location = new System.Drawing.Point(470, 35);
581 577
            this.radLabelIsID2Work.Name = "radLabelIsID2Work";
582 578
            this.radLabelIsID2Work.Size = new System.Drawing.Size(80, 17);
583 579
            this.radLabelIsID2Work.TabIndex = 6;
......
587 583
            // 
588 584
            this.radLabelJobLevel.Anchor = System.Windows.Forms.AnchorStyles.Left;
589 585
            this.radLabelJobLevel.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
590
            this.radLabelJobLevel.Location = new System.Drawing.Point(472, 6);
586
            this.radLabelJobLevel.Location = new System.Drawing.Point(470, 6);
591 587
            this.radLabelJobLevel.Name = "radLabelJobLevel";
592 588
            this.radLabelJobLevel.Size = new System.Drawing.Size(47, 17);
593 589
            this.radLabelJobLevel.TabIndex = 7;
......
638 634
            this.radButtonSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
639 635
            this.radButtonSearch.Cursor = System.Windows.Forms.Cursors.Hand;
640 636
            this.radButtonSearch.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
641
            this.radButtonSearch.Location = new System.Drawing.Point(886, 4);
637
            this.radButtonSearch.Location = new System.Drawing.Point(884, 4);
642 638
            this.radButtonSearch.Name = "radButtonSearch";
643 639
            this.tableLayoutPanelCondition.SetRowSpan(this.radButtonSearch, 5);
644 640
            this.radButtonSearch.Size = new System.Drawing.Size(54, 136);
......
652 648
            this.radDropDownListProject.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
653 649
            this.radDropDownListProject.Location = new System.Drawing.Point(146, 5);
654 650
            this.radDropDownListProject.Name = "radDropDownListProject";
655
            this.radDropDownListProject.Size = new System.Drawing.Size(113, 20);
651
            this.radDropDownListProject.Size = new System.Drawing.Size(112, 20);
656 652
            this.radDropDownListProject.TabIndex = 7;
657 653
            // 
658 654
            // radLabelDocumentNo
659 655
            // 
660 656
            this.radLabelDocumentNo.Anchor = System.Windows.Forms.AnchorStyles.Left;
661 657
            this.radLabelDocumentNo.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
662
            this.radLabelDocumentNo.Location = new System.Drawing.Point(678, 6);
658
            this.radLabelDocumentNo.Location = new System.Drawing.Point(675, 6);
663 659
            this.radLabelDocumentNo.Name = "radLabelDocumentNo";
664 660
            this.radLabelDocumentNo.Size = new System.Drawing.Size(49, 17);
665 661
            this.radLabelDocumentNo.TabIndex = 6;
......
668 664
            // radTextBoxDocumentNo
669 665
            // 
670 666
            this.radTextBoxDocumentNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
671
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(764, 5);
667
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(761, 5);
672 668
            this.radTextBoxDocumentNo.Name = "radTextBoxDocumentNo";
673
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(113, 20);
669
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(112, 20);
674 670
            this.radTextBoxDocumentNo.TabIndex = 8;
675 671
            // 
676 672
            // radLabelPersonInCharge
677 673
            // 
678 674
            this.radLabelPersonInCharge.Anchor = System.Windows.Forms.AnchorStyles.Left;
679 675
            this.radLabelPersonInCharge.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
680
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(266, 6);
676
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(265, 6);
681 677
            this.radLabelPersonInCharge.Name = "radLabelPersonInCharge";
682 678
            this.radLabelPersonInCharge.Size = new System.Drawing.Size(47, 17);
683 679
            this.radLabelPersonInCharge.TabIndex = 6;
......
688 684
            this.radDropDownListPersonInCharge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
689 685
            this.radDropDownListPersonInCharge.DropDownAnimationEnabled = true;
690 686
            this.radDropDownListPersonInCharge.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
691
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(352, 5);
687
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(351, 5);
692 688
            this.radDropDownListPersonInCharge.Name = "radDropDownListPersonInCharge";
693
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(113, 20);
689
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(112, 20);
694 690
            this.radDropDownListPersonInCharge.TabIndex = 9;
695 691
            // 
696 692
            // radLabel1
......
708 704
            this.radDropDownListJobLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
709 705
            this.radDropDownListJobLevel.DropDownAnimationEnabled = true;
710 706
            this.radDropDownListJobLevel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
711
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(558, 5);
707
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(556, 5);
712 708
            this.radDropDownListJobLevel.Name = "radDropDownListJobLevel";
713
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(113, 20);
709
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(112, 20);
714 710
            this.radDropDownListJobLevel.TabIndex = 11;
715 711
            // 
716 712
            // radLabelID2Status
......
727 723
            // 
728 724
            this.radLabel10.Anchor = System.Windows.Forms.AnchorStyles.Left;
729 725
            this.radLabel10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
730
            this.radLabel10.Location = new System.Drawing.Point(266, 93);
726
            this.radLabel10.Location = new System.Drawing.Point(265, 93);
731 727
            this.radLabel10.Name = "radLabel10";
732 728
            this.radLabel10.Size = new System.Drawing.Size(61, 17);
733 729
            this.radLabel10.TabIndex = 9;
......
738 734
            this.radDropDownListIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
739 735
            this.radDropDownListIsID2Work.DropDownAnimationEnabled = true;
740 736
            this.radDropDownListIsID2Work.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
741
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(558, 34);
737
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(556, 34);
742 738
            this.radDropDownListIsID2Work.Name = "radDropDownListIsID2Work";
743
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(113, 20);
739
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(112, 20);
744 740
            this.radDropDownListIsID2Work.TabIndex = 12;
745 741
            // 
746 742
            // radDropDownListID2Status
......
750 746
            this.radDropDownListID2Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
751 747
            this.radDropDownListID2Status.Location = new System.Drawing.Point(146, 63);
752 748
            this.radDropDownListID2Status.Name = "radDropDownListID2Status";
753
            this.radDropDownListID2Status.Size = new System.Drawing.Size(113, 20);
749
            this.radDropDownListID2Status.Size = new System.Drawing.Size(112, 20);
754 750
            this.radDropDownListID2Status.TabIndex = 13;
755 751
            // 
756 752
            // radDropDownListAVEVAStatus
......
758 754
            this.radDropDownListAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
759 755
            this.radDropDownListAVEVAStatus.DropDownAnimationEnabled = true;
760 756
            this.radDropDownListAVEVAStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
761
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(352, 63);
757
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(351, 63);
762 758
            this.radDropDownListAVEVAStatus.Name = "radDropDownListAVEVAStatus";
763
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(113, 20);
759
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(112, 20);
764 760
            this.radDropDownListAVEVAStatus.TabIndex = 14;
765 761
            // 
766 762
            // radDropDownListProdIsResult
......
770 766
            this.radDropDownListProdIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
771 767
            this.radDropDownListProdIsResult.Location = new System.Drawing.Point(146, 92);
772 768
            this.radDropDownListProdIsResult.Name = "radDropDownListProdIsResult";
773
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(113, 20);
769
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(112, 20);
774 770
            this.radDropDownListProdIsResult.TabIndex = 15;
775 771
            // 
776 772
            // radDropDownListClientIsResult
......
778 774
            this.radDropDownListClientIsResult.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
779 775
            this.radDropDownListClientIsResult.DropDownAnimationEnabled = true;
780 776
            this.radDropDownListClientIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
781
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(352, 92);
777
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(351, 92);
782 778
            this.radDropDownListClientIsResult.Name = "radDropDownListClientIsResult";
783
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(113, 20);
779
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(112, 20);
784 780
            this.radDropDownListClientIsResult.TabIndex = 16;
785 781
            // 
786 782
            // radLabel6
......
797 793
            // 
798 794
            this.radLabel7.Anchor = System.Windows.Forms.AnchorStyles.Left;
799 795
            this.radLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
800
            this.radLabel7.Location = new System.Drawing.Point(266, 121);
796
            this.radLabel7.Location = new System.Drawing.Point(265, 121);
801 797
            this.radLabel7.Name = "radLabel7";
802 798
            this.radLabel7.Size = new System.Drawing.Size(72, 17);
803 799
            this.radLabel7.TabIndex = 12;
......
820 816
            this.radDropDownListGateway.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
821 817
            this.radDropDownListGateway.Location = new System.Drawing.Point(146, 120);
822 818
            this.radDropDownListGateway.Name = "radDropDownListGateway";
823
            this.radDropDownListGateway.Size = new System.Drawing.Size(113, 20);
819
            this.radDropDownListGateway.Size = new System.Drawing.Size(112, 20);
824 820
            this.radDropDownListGateway.TabIndex = 19;
825 821
            // 
826 822
            // radDropDownListRegistration
......
828 824
            this.radDropDownListRegistration.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
829 825
            this.radDropDownListRegistration.DropDownAnimationEnabled = true;
830 826
            this.radDropDownListRegistration.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
831
            this.radDropDownListRegistration.Location = new System.Drawing.Point(352, 120);
827
            this.radDropDownListRegistration.Location = new System.Drawing.Point(351, 120);
832 828
            this.radDropDownListRegistration.Name = "radDropDownListRegistration";
833
            this.radDropDownListRegistration.Size = new System.Drawing.Size(113, 20);
829
            this.radDropDownListRegistration.Size = new System.Drawing.Size(112, 20);
834 830
            this.radDropDownListRegistration.TabIndex = 20;
835 831
            // 
836 832
            // tableLayoutPanelGroup
......
1271 1267
            this.radGridViewDocuments.MasterTemplate.EnableFiltering = true;
1272 1268
            this.radGridViewDocuments.MasterTemplate.ShowFilteringRow = false;
1273 1269
            this.radGridViewDocuments.MasterTemplate.ShowHeaderCellButtons = true;
1274
            this.radGridViewDocuments.MasterTemplate.Templates.AddRange(new Telerik.WinControls.UI.GridViewTemplate[] {
1275
            this.DetailViewTemplate});
1276
            this.radGridViewDocuments.MasterTemplate.ViewDefinition = tableViewDefinition2;
1270
            this.radGridViewDocuments.MasterTemplate.ViewDefinition = tableViewDefinition1;
1277 1271
            this.radGridViewDocuments.Name = "radGridViewDocuments";
1278 1272
            gridViewRelation1.ChildColumnNames = ((System.Collections.Specialized.StringCollection)(resources.GetObject("gridViewRelation1.ChildColumnNames")));
1279 1273
            gridViewRelation1.ParentColumnNames = ((System.Collections.Specialized.StringCollection)(resources.GetObject("gridViewRelation1.ParentColumnNames")));
......
1284 1278
            this.radGridViewDocuments.Size = new System.Drawing.Size(944, 295);
1285 1279
            this.radGridViewDocuments.TabIndex = 0;
1286 1280
            // 
1287
            // DetailViewTemplate
1288
            // 
1289
            gridViewTextBoxColumn11.EnableExpressionEditor = false;
1290
            gridViewTextBoxColumn11.FieldName = "MarkupText";
1291
            gridViewTextBoxColumn11.HeaderText = "MarkupText";
1292
            gridViewTextBoxColumn11.Name = "MarkupText";
1293
            this.DetailViewTemplate.Columns.AddRange(new Telerik.WinControls.UI.GridViewDataColumn[] {
1294
            gridViewTextBoxColumn11});
1295
            this.DetailViewTemplate.EnableAlternatingRowColor = true;
1296
            this.DetailViewTemplate.ViewDefinition = tableViewDefinition1;
1297
            // 
1298 1281
            // radCommandBar1
1299 1282
            // 
1300 1283
            this.radCommandBar1.Dock = System.Windows.Forms.DockStyle.Top;
......
1683 1666
            this.tableLayoutMain.PerformLayout();
1684 1667
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments.MasterTemplate)).EndInit();
1685 1668
            ((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments)).EndInit();
1686
            ((System.ComponentModel.ISupportInitialize)(this.DetailViewTemplate)).EndInit();
1687 1669
            ((System.ComponentModel.ISupportInitialize)(this.radCommandBar1)).EndInit();
1688 1670
            ((System.ComponentModel.ISupportInitialize)(this.splitPanelRight)).EndInit();
1689 1671
            this.splitPanelRight.ResumeLayout(false);
......
1778 1760
        private Telerik.WinControls.UI.CommandBarSeparator commandBarSeparator1;
1779 1761
        private Telerik.WinControls.UI.CommandBarSeparator commandBarSeparator2;
1780 1762
        private Telerik.WinControls.UI.CommandBarHostItem btnShowAllDetail;
1781
        private Telerik.WinControls.UI.GridViewTemplate DetailViewTemplate;
1782 1763
        private Telerik.WinControls.UI.SplitPanel splitPanel3;
1783 1764
        private Telerik.WinControls.UI.RadPageView radPageViewViewer;
1784 1765
        private Telerik.WinControls.UI.RadPageViewPage radPageViewPageAutoCAD;

내보내기 Unified diff

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