프로젝트

일반

사용자정보

개정판 fe310cac

IDfe310cac7a179302dc18f5da9b97a8092e314b05
상위 d62e37ef
하위 79d7836e

유성호이(가) 일년 이상 전에 추가함

issue #0000
작업시간 삭제
- Main 화면(crud 포함)
- ID2 Connection 시 자동계산 로직 삭제
- Model에서 제거

Change-Id: If868c2ff52188d7e60009a48d8e7ea7c62df7fc1

차이점 보기:

ID2.Manager/ID2.Manager.Controller/Controllers/DocumentController.cs
100 100
                                     ID2Connection = doc.ID2Connection,
101 101
                                     ID2StartDate = doc.ID2StartDate,
102 102
                                     ID2EndDate = dw?.DATETIME == null ? (DateTime?)null : Convert.ToDateTime(dw?.DATETIME),
103
                                     ID2JobTime = doc.ID2JobTime,
104 103
                                     ID2Status = doc.ID2Status,
105 104
                                     ID2Issues = doc.ID2Issues,
106 105
                                     AVEVAConnection = doc.AVEVAConnection,
ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
196 196
            {
197 197

  
198 198
                //files.[FileID],files.[FileID] as AttFileID, files.RefID, files.Category, files.FileType, files.FileName, files.FilePath, files.FileExtension, files.FileData, files.Remark, files.CreatedDate, files.Creator,
199
                    string query = $@"
200
                            select  doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime,
201
                            files.[FileID] as FileID, files.*,
202
                            markus.PROJECT_NO as PROJECT_NO, markus.*
203
                            from     dbo.Documents doc
204
	                        LEFT OUTER JOIN AttachFIles files ON doc.DocID = fIles.RefID 
205
                            LEFT OUTER JOIN 
206
                                    (SELECT [PROJECT_NO] as PROJECT_NO
207
                                          ,[DOCUMENT_ID] as DocumentNo
199
                string query = $@"
200
select  doc.*,
201
files.[FileID] as FileID, files.*,
202
markus.PROJECT_NO as PROJECT_NO, markus.*
203
from     dbo.Documents doc
204
LEFT OUTER JOIN AttachFIles files ON doc.DocID = fIles.RefID 
205
LEFT OUTER JOIN 
206
        (SELECT [PROJECT_NO] as PROJECT_NO
207
                ,[DOCUMENT_ID] as DocumentNo
208 208
                                          
209
                                          ,[PAGENUMBER]
210
                                          ,[Text] as TEXT
211
                                          ,[CREATE_DATE] as CREATE_DATE
212
                                          ,[NAME] as CREATE_USER
213
                                      FROM ViewMarkupData) markus 
214
                            ON doc.DocumentNo = markus.DocumentNo
215
                            where    doc.IsDeleted=0 {sbWhere}
216
                            order by doc.Seq
209
                ,[PAGENUMBER]
210
                ,[Text] as TEXT
211
                ,[CREATE_DATE] as CREATE_DATE
212
                ,[NAME] as CREATE_USER
213
            FROM ViewMarkupData) markus 
214
ON doc.DocumentNo = markus.DocumentNo
215
where    doc.IsDeleted=0 {sbWhere}
216
order by doc.Seq
217 217

  
218 218
select @Total=count(*) from dbo.Documents doc where doc.IsDeleted=0 {sbTotalWhere}
219 219
select @Total;";
......
615 615

  
616 616
if @@rowcount > 0
617 617
begin
618
    select *, datediff(SECOND, ID2StartDate, ID2EndDate) as ID2JobTime from dbo.Documents where DocID=@DocID
618
    select * from dbo.Documents where DocID=@DocID
619 619
end
620 620
else
621 621
begin
622
    select *, 0 as ID2JobTime from dbo.Documents where 1=2
622
    select * from dbo.Documents where 1=2
623 623
end;";
624 624
                            resultData = base.QueryFirstOrDefault<Documents>(query, parameters, transaction);
625 625
                        }
ID2.Manager/ID2.Manager.Data/Models/Documents.cs
108 108
        [DataMember]
109 109
        public DateTime? ID2EndDate { get; set; }
110 110
        [DataMember]
111
        public int ID2JobTime { get; set; }
112
        public string ID2JobTimetoString
113
        {
114
            get
115
            {
116
                StringBuilder sbTemp;
117
                if (ID2JobTime > 0)
118
                {
119
                    sbTemp = new StringBuilder(TimeSpan.FromSeconds(Convert.ToInt32(ID2JobTime)).ToString(@"dd\:hh\:mm\:ss"));
120
                }
121
                else if (ID2JobTime < 0)
122
                {
123
                    sbTemp = new StringBuilder(TimeSpan.FromSeconds(Convert.ToInt32(ID2JobTime)).ToString(@"dd\:hh\:mm\:ss"));
124
                    sbTemp.Insert(0, "-");
125
                }
126
                else
127
                {
128
                    sbTemp = new StringBuilder();
129
                }
130

  
131
                return sbTemp.ToString();
132
            }
133
        }
134
        [DataMember]
135 111
        public string ID2Status { get; set; }
136 112
        [DataMember]
137 113
        public string ID2Issues { get; set; }
......
205 181
                && this.ToCreator == other.ToCreator && this.ToIsMarkup == other.ToIsMarkup
206 182
                && this.FrReviewStatus == other.FrReviewStatus && this.FrRemarks == other.FrRemarks && this.FrCreator == other.FrCreator
207 183
                && this.FrIsMarkup == other.FrIsMarkup && this.IsID2Work == other.IsID2Work && this.ID2Connection == other.ID2Connection
208
                && this.ID2StartDate == other.ID2StartDate && this.ID2EndDate == other.ID2EndDate && this.ID2JobTime == other.ID2JobTime && this.ID2Status == other.ID2Status
184
                && this.ID2StartDate == other.ID2StartDate && this.ID2EndDate == other.ID2EndDate && this.ID2Status == other.ID2Status
209 185
                && this.ID2Issues == other.ID2Issues && this.AVEVAConnection == other.AVEVAConnection && this.AVEVAConvertDate == other.AVEVAConvertDate && this.AVEVAReviewDate == other.AVEVAReviewDate
210 186
                && this.AVEVAStatus == other.AVEVAStatus && this.AVEVAIssues == other.AVEVAIssues && this.ReviewFilePath == other.ReviewFilePath && this.ReviewFileName == other.ReviewFileName
211 187
                && this.ProdReviewer == other.ProdReviewer && this.ProdIsResult == other.ProdIsResult && this.ProdRemarks == other.ProdRemarks && this.ClientReviewer == other.ClientReviewer
......
230 206
                + this.ToCreator.GetNullableHash() + this.ToIsMarkup.GetNullableHash()
231 207
                + this.FrReviewStatus.GetNullableHash() + this.FrRemarks.GetNullableHash() + this.FrCreator.GetNullableHash()
232 208
                + this.FrIsMarkup.GetNullableHash() + this.IsID2Work.GetNullableHash() + this.ID2Connection.GetNullableHash()
233
                + this.ID2StartDate.GetNullableHash() + this.ID2EndDate.GetNullableHash() + this.ID2JobTime.GetNullableHash() + this.ID2Status.GetNullableHash()
209
                + this.ID2StartDate.GetNullableHash() + this.ID2EndDate.GetNullableHash() + this.ID2Status.GetNullableHash()
234 210
                + this.ID2Issues.GetNullableHash() + this.AVEVAConnection.GetNullableHash() + this.AVEVAConvertDate.GetNullableHash() + this.AVEVAReviewDate.GetNullableHash()
235 211
                + this.AVEVAStatus.GetNullableHash() + this.AVEVAIssues.GetNullableHash() + this.ReviewFilePath.GetNullableHash() + this.ReviewFileName.GetNullableHash()
236 212
                + this.ProdReviewer.GetNullableHash() + this.ProdIsResult.GetNullableHash() + this.ProdRemarks.GetNullableHash() + this.ClientReviewer.GetNullableHash()
ID2.Manager/ID2.Manager/Main.Designer.cs
54 54
            Telerik.WinControls.UI.GridViewCommandColumn gridViewCommandColumn5 = new Telerik.WinControls.UI.GridViewCommandColumn();
55 55
            Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn1 = new Telerik.WinControls.UI.GridViewDateTimeColumn();
56 56
            Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn2 = new Telerik.WinControls.UI.GridViewDateTimeColumn();
57
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn5 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
58 57
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn13 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
59
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn6 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
58
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn5 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
60 59
            Telerik.WinControls.UI.GridViewCommandColumn gridViewCommandColumn6 = new Telerik.WinControls.UI.GridViewCommandColumn();
61 60
            Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn3 = new Telerik.WinControls.UI.GridViewDateTimeColumn();
62 61
            Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn4 = new Telerik.WinControls.UI.GridViewDateTimeColumn();
63 62
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn14 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
64
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn7 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
63
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn6 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
65 64
            Telerik.WinControls.UI.GridViewCommandColumn gridViewCommandColumn7 = new Telerik.WinControls.UI.GridViewCommandColumn();
66 65
            Telerik.WinControls.UI.GridViewCommandColumn gridViewCommandColumn8 = new Telerik.WinControls.UI.GridViewCommandColumn();
67 66
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn15 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
68 67
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn16 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
69
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn8 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
68
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn7 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
70 69
            Telerik.WinControls.UI.GridViewImageColumn gridViewImageColumn3 = new Telerik.WinControls.UI.GridViewImageColumn();
71 70
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn17 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
72 71
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn18 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
73
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn9 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
72
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn8 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
74 73
            Telerik.WinControls.UI.GridViewImageColumn gridViewImageColumn4 = new Telerik.WinControls.UI.GridViewImageColumn();
75 74
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn19 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
76 75
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn20 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
77 76
            Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn21 = new Telerik.WinControls.UI.GridViewComboBoxColumn();
78
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn10 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
77
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn9 = new Telerik.WinControls.UI.GridViewTextBoxColumn();
79 78
            Telerik.WinControls.UI.TableViewDefinition tableViewDefinition1 = new Telerik.WinControls.UI.TableViewDefinition();
80 79
            Telerik.WinControls.UI.GridViewRelation gridViewRelation1 = new Telerik.WinControls.UI.GridViewRelation();
81 80
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
......
483 482
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
484 483
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
485 484
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
486
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82F));
485
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 83F));
487 486
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 2);
488 487
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 2);
489 488
            this.tableLayoutPanelCondition.Controls.Add(this.radLabelFrReviewStatus, 3, 2);
......
540 539
            this.radDropDownListFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
541 540
            this.radDropDownListFrReviewStatus.DropDownAnimationEnabled = true;
542 541
            this.radDropDownListFrReviewStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
543
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(358, 60);
542
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(357, 60);
544 543
            this.radDropDownListFrReviewStatus.Name = "radDropDownListFrReviewStatus";
545
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(119, 20);
544
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(118, 20);
546 545
            this.radDropDownListFrReviewStatus.TabIndex = 18;
547 546
            // 
548 547
            // radDropDownListToIsDiscussion
......
552 551
            this.radDropDownListToIsDiscussion.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
553 552
            this.radDropDownListToIsDiscussion.Location = new System.Drawing.Point(146, 60);
554 553
            this.radDropDownListToIsDiscussion.Name = "radDropDownListToIsDiscussion";
555
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(119, 20);
554
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(118, 20);
556 555
            this.radDropDownListToIsDiscussion.TabIndex = 17;
557 556
            // 
558 557
            // radLabelFrReviewStatus
559 558
            // 
560 559
            this.radLabelFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
561 560
            this.radLabelFrReviewStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
562
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(272, 62);
561
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(271, 62);
563 562
            this.radLabelFrReviewStatus.Name = "radLabelFrReviewStatus";
564 563
            this.radLabelFrReviewStatus.Size = new System.Drawing.Size(59, 17);
565 564
            this.radLabelFrReviewStatus.TabIndex = 7;
......
589 588
            // 
590 589
            this.radLabelAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
591 590
            this.radLabelAVEVAStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
592
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(484, 90);
591
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(482, 90);
593 592
            this.radLabelAVEVAStatus.Name = "radLabelAVEVAStatus";
594 593
            this.radLabelAVEVAStatus.Size = new System.Drawing.Size(86, 17);
595 594
            this.radLabelAVEVAStatus.TabIndex = 8;
......
599 598
            // 
600 599
            this.radLabelIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
601 600
            this.radLabelIsID2Work.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
602
            this.radLabelIsID2Work.Location = new System.Drawing.Point(484, 62);
601
            this.radLabelIsID2Work.Location = new System.Drawing.Point(482, 62);
603 602
            this.radLabelIsID2Work.Name = "radLabelIsID2Work";
604 603
            this.radLabelIsID2Work.Size = new System.Drawing.Size(80, 17);
605 604
            this.radLabelIsID2Work.TabIndex = 6;
......
609 608
            // 
610 609
            this.radLabelJobLevel.Anchor = System.Windows.Forms.AnchorStyles.Left;
611 610
            this.radLabelJobLevel.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
612
            this.radLabelJobLevel.Location = new System.Drawing.Point(484, 34);
611
            this.radLabelJobLevel.Location = new System.Drawing.Point(482, 34);
613 612
            this.radLabelJobLevel.Name = "radLabelJobLevel";
614 613
            this.radLabelJobLevel.Size = new System.Drawing.Size(47, 17);
615 614
            this.radLabelJobLevel.TabIndex = 7;
......
660 659
            this.radButtonSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
661 660
            this.radButtonSearch.Cursor = System.Windows.Forms.Cursors.Default;
662 661
            this.radButtonSearch.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
663
            this.radButtonSearch.Location = new System.Drawing.Point(919, 32);
662
            this.radButtonSearch.Location = new System.Drawing.Point(917, 32);
664 663
            this.radButtonSearch.Name = "radButtonSearch";
665 664
            this.tableLayoutPanelCondition.SetRowSpan(this.radButtonSearch, 5);
666 665
            this.radButtonSearch.Size = new System.Drawing.Size(54, 138);
......
674 673
            this.radDropDownListProject.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
675 674
            this.radDropDownListProject.Location = new System.Drawing.Point(146, 32);
676 675
            this.radDropDownListProject.Name = "radDropDownListProject";
677
            this.radDropDownListProject.Size = new System.Drawing.Size(119, 20);
676
            this.radDropDownListProject.Size = new System.Drawing.Size(118, 20);
678 677
            this.radDropDownListProject.TabIndex = 7;
679 678
            // 
680 679
            // radLabelDocumentNo
681 680
            // 
682 681
            this.radLabelDocumentNo.Anchor = System.Windows.Forms.AnchorStyles.Left;
683 682
            this.radLabelDocumentNo.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
684
            this.radLabelDocumentNo.Location = new System.Drawing.Point(696, 34);
683
            this.radLabelDocumentNo.Location = new System.Drawing.Point(693, 34);
685 684
            this.radLabelDocumentNo.Name = "radLabelDocumentNo";
686 685
            this.radLabelDocumentNo.Size = new System.Drawing.Size(49, 17);
687 686
            this.radLabelDocumentNo.TabIndex = 6;
......
690 689
            // radTextBoxDocumentNo
691 690
            // 
692 691
            this.radTextBoxDocumentNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
693
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(782, 32);
692
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(779, 32);
694 693
            this.radTextBoxDocumentNo.Name = "radTextBoxDocumentNo";
695
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(119, 20);
694
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(118, 20);
696 695
            this.radTextBoxDocumentNo.TabIndex = 8;
697 696
            // 
698 697
            // radLabelPersonInCharge
699 698
            // 
700 699
            this.radLabelPersonInCharge.Anchor = System.Windows.Forms.AnchorStyles.Left;
701 700
            this.radLabelPersonInCharge.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
702
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(272, 34);
701
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(271, 34);
703 702
            this.radLabelPersonInCharge.Name = "radLabelPersonInCharge";
704 703
            this.radLabelPersonInCharge.Size = new System.Drawing.Size(47, 17);
705 704
            this.radLabelPersonInCharge.TabIndex = 6;
......
710 709
            this.radDropDownListPersonInCharge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
711 710
            this.radDropDownListPersonInCharge.DropDownAnimationEnabled = true;
712 711
            this.radDropDownListPersonInCharge.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
713
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(358, 32);
712
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(357, 32);
714 713
            this.radDropDownListPersonInCharge.Name = "radDropDownListPersonInCharge";
715
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(119, 20);
714
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(118, 20);
716 715
            this.radDropDownListPersonInCharge.TabIndex = 9;
717 716
            // 
718 717
            // radLabel1
......
730 729
            this.radDropDownListJobLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
731 730
            this.radDropDownListJobLevel.DropDownAnimationEnabled = true;
732 731
            this.radDropDownListJobLevel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
733
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(570, 32);
732
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(568, 32);
734 733
            this.radDropDownListJobLevel.Name = "radDropDownListJobLevel";
735
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(119, 20);
734
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(118, 20);
736 735
            this.radDropDownListJobLevel.TabIndex = 11;
737 736
            // 
738 737
            // radLabelID2Status
......
749 748
            // 
750 749
            this.radLabel10.Anchor = System.Windows.Forms.AnchorStyles.Left;
751 750
            this.radLabel10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
752
            this.radLabel10.Location = new System.Drawing.Point(272, 118);
751
            this.radLabel10.Location = new System.Drawing.Point(271, 118);
753 752
            this.radLabel10.Name = "radLabel10";
754 753
            this.radLabel10.Size = new System.Drawing.Size(61, 17);
755 754
            this.radLabel10.TabIndex = 9;
......
760 759
            this.radDropDownListIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
761 760
            this.radDropDownListIsID2Work.DropDownAnimationEnabled = true;
762 761
            this.radDropDownListIsID2Work.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
763
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(570, 60);
762
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(568, 60);
764 763
            this.radDropDownListIsID2Work.Name = "radDropDownListIsID2Work";
765
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(119, 20);
764
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(118, 20);
766 765
            this.radDropDownListIsID2Work.TabIndex = 12;
767 766
            // 
768 767
            // radDropDownListID2Status
......
772 771
            this.radDropDownListID2Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
773 772
            this.radDropDownListID2Status.Location = new System.Drawing.Point(146, 88);
774 773
            this.radDropDownListID2Status.Name = "radDropDownListID2Status";
775
            this.radDropDownListID2Status.Size = new System.Drawing.Size(119, 20);
774
            this.radDropDownListID2Status.Size = new System.Drawing.Size(118, 20);
776 775
            this.radDropDownListID2Status.TabIndex = 13;
777 776
            // 
778 777
            // radDropDownListAVEVAStatus
......
780 779
            this.radDropDownListAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
781 780
            this.radDropDownListAVEVAStatus.DropDownAnimationEnabled = true;
782 781
            this.radDropDownListAVEVAStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
783
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(570, 88);
782
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(568, 88);
784 783
            this.radDropDownListAVEVAStatus.Name = "radDropDownListAVEVAStatus";
785
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(119, 20);
784
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(118, 20);
786 785
            this.radDropDownListAVEVAStatus.TabIndex = 14;
787 786
            // 
788 787
            // radDropDownListProdIsResult
......
792 791
            this.radDropDownListProdIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
793 792
            this.radDropDownListProdIsResult.Location = new System.Drawing.Point(146, 116);
794 793
            this.radDropDownListProdIsResult.Name = "radDropDownListProdIsResult";
795
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(119, 20);
794
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(118, 20);
796 795
            this.radDropDownListProdIsResult.TabIndex = 15;
797 796
            // 
798 797
            // radDropDownListClientIsResult
......
800 799
            this.radDropDownListClientIsResult.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
801 800
            this.radDropDownListClientIsResult.DropDownAnimationEnabled = true;
802 801
            this.radDropDownListClientIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
803
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(358, 116);
802
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(357, 116);
804 803
            this.radDropDownListClientIsResult.Name = "radDropDownListClientIsResult";
805
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(119, 20);
804
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(118, 20);
806 805
            this.radDropDownListClientIsResult.TabIndex = 16;
807 806
            // 
808 807
            // radLabel6
......
819 818
            // 
820 819
            this.radLabel7.Anchor = System.Windows.Forms.AnchorStyles.Left;
821 820
            this.radLabel7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
822
            this.radLabel7.Location = new System.Drawing.Point(272, 148);
821
            this.radLabel7.Location = new System.Drawing.Point(271, 148);
823 822
            this.radLabel7.Name = "radLabel7";
824 823
            this.radLabel7.Size = new System.Drawing.Size(72, 17);
825 824
            this.radLabel7.TabIndex = 12;
......
842 841
            this.radDropDownListGateway.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
843 842
            this.radDropDownListGateway.Location = new System.Drawing.Point(146, 147);
844 843
            this.radDropDownListGateway.Name = "radDropDownListGateway";
845
            this.radDropDownListGateway.Size = new System.Drawing.Size(119, 20);
844
            this.radDropDownListGateway.Size = new System.Drawing.Size(118, 20);
846 845
            this.radDropDownListGateway.TabIndex = 19;
847 846
            // 
848 847
            // radDropDownListRegistration
......
850 849
            this.radDropDownListRegistration.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
851 850
            this.radDropDownListRegistration.DropDownAnimationEnabled = true;
852 851
            this.radDropDownListRegistration.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
853
            this.radDropDownListRegistration.Location = new System.Drawing.Point(358, 147);
852
            this.radDropDownListRegistration.Location = new System.Drawing.Point(357, 147);
854 853
            this.radDropDownListRegistration.Name = "radDropDownListRegistration";
855
            this.radDropDownListRegistration.Size = new System.Drawing.Size(119, 20);
854
            this.radDropDownListRegistration.Size = new System.Drawing.Size(118, 20);
856 855
            this.radDropDownListRegistration.TabIndex = 20;
857 856
            // 
858 857
            // radLabel8
......
944 943
            // 
945 944
            this.radLabelID2Issues.Anchor = System.Windows.Forms.AnchorStyles.Left;
946 945
            this.radLabelID2Issues.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
947
            this.radLabelID2Issues.Location = new System.Drawing.Point(272, 90);
946
            this.radLabelID2Issues.Location = new System.Drawing.Point(271, 90);
948 947
            this.radLabelID2Issues.Name = "radLabelID2Issues";
949 948
            this.radLabelID2Issues.Size = new System.Drawing.Size(59, 17);
950 949
            this.radLabelID2Issues.TabIndex = 23;
......
954 953
            // 
955 954
            this.radLabelAVEVAIssues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
956 955
            this.radLabelAVEVAIssues.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
957
            this.radLabelAVEVAIssues.Location = new System.Drawing.Point(696, 90);
956
            this.radLabelAVEVAIssues.Location = new System.Drawing.Point(693, 90);
958 957
            this.radLabelAVEVAIssues.Name = "radLabelAVEVAIssues";
959 958
            this.radLabelAVEVAIssues.Size = new System.Drawing.Size(81, 17);
960 959
            this.radLabelAVEVAIssues.TabIndex = 24;
......
965 964
            this.radDropDownListID2Issues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
966 965
            this.radDropDownListID2Issues.DropDownAnimationEnabled = true;
967 966
            this.radDropDownListID2Issues.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
968
            this.radDropDownListID2Issues.Location = new System.Drawing.Point(358, 88);
967
            this.radDropDownListID2Issues.Location = new System.Drawing.Point(357, 88);
969 968
            this.radDropDownListID2Issues.Name = "radDropDownListID2Issues";
970
            this.radDropDownListID2Issues.Size = new System.Drawing.Size(119, 20);
969
            this.radDropDownListID2Issues.Size = new System.Drawing.Size(118, 20);
971 970
            this.radDropDownListID2Issues.TabIndex = 25;
972 971
            // 
973 972
            // radDropDownListAVEVAIssues
......
975 974
            this.radDropDownListAVEVAIssues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
976 975
            this.radDropDownListAVEVAIssues.DropDownAnimationEnabled = true;
977 976
            this.radDropDownListAVEVAIssues.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
978
            this.radDropDownListAVEVAIssues.Location = new System.Drawing.Point(782, 88);
977
            this.radDropDownListAVEVAIssues.Location = new System.Drawing.Point(779, 88);
979 978
            this.radDropDownListAVEVAIssues.Name = "radDropDownListAVEVAIssues";
980
            this.radDropDownListAVEVAIssues.Size = new System.Drawing.Size(119, 20);
979
            this.radDropDownListAVEVAIssues.Size = new System.Drawing.Size(118, 20);
981 980
            this.radDropDownListAVEVAIssues.TabIndex = 26;
982 981
            // 
983 982
            // tableLayoutPanelGroup
......
1246 1245
            gridViewDateTimeColumn2.ReadOnly = true;
1247 1246
            gridViewDateTimeColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1248 1247
            gridViewDateTimeColumn2.Width = 120;
1249
            gridViewTextBoxColumn5.EnableExpressionEditor = false;
1250
            gridViewTextBoxColumn5.FieldName = "ID2JobTimetoString";
1251
            gridViewTextBoxColumn5.HeaderText = "작업시간";
1252
            gridViewTextBoxColumn5.Name = "ID2JobTime";
1253
            gridViewTextBoxColumn5.ReadOnly = true;
1254
            gridViewTextBoxColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1255
            gridViewTextBoxColumn5.Width = 80;
1256 1248
            gridViewComboBoxColumn13.EnableExpressionEditor = false;
1257 1249
            gridViewComboBoxColumn13.FieldName = "ID2Status";
1258 1250
            gridViewComboBoxColumn13.HeaderText = "Status";
1259 1251
            gridViewComboBoxColumn13.Name = "ID2Status";
1260 1252
            gridViewComboBoxColumn13.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1261 1253
            gridViewComboBoxColumn13.Width = 70;
1262
            gridViewTextBoxColumn6.EnableExpressionEditor = false;
1263
            gridViewTextBoxColumn6.FieldName = "ID2Issues";
1264
            gridViewTextBoxColumn6.HeaderText = "이슈사항";
1265
            gridViewTextBoxColumn6.Name = "ID2Issues";
1266
            gridViewTextBoxColumn6.Width = 150;
1254
            gridViewTextBoxColumn5.EnableExpressionEditor = false;
1255
            gridViewTextBoxColumn5.FieldName = "ID2Issues";
1256
            gridViewTextBoxColumn5.HeaderText = "이슈사항";
1257
            gridViewTextBoxColumn5.Name = "ID2Issues";
1258
            gridViewTextBoxColumn5.Width = 150;
1267 1259
            gridViewCommandColumn6.EnableExpressionEditor = false;
1268 1260
            gridViewCommandColumn6.FieldName = "AVEVAConnection";
1269 1261
            gridViewCommandColumn6.HeaderText = "연결";
......
1291 1283
            gridViewComboBoxColumn14.Name = "AVEVAStatus";
1292 1284
            gridViewComboBoxColumn14.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1293 1285
            gridViewComboBoxColumn14.Width = 70;
1294
            gridViewTextBoxColumn7.EnableExpressionEditor = false;
1295
            gridViewTextBoxColumn7.FieldName = "AVEVAIssues";
1296
            gridViewTextBoxColumn7.HeaderText = "이슈사항";
1297
            gridViewTextBoxColumn7.Name = "AVEVAIssues";
1298
            gridViewTextBoxColumn7.Width = 150;
1286
            gridViewTextBoxColumn6.EnableExpressionEditor = false;
1287
            gridViewTextBoxColumn6.FieldName = "AVEVAIssues";
1288
            gridViewTextBoxColumn6.HeaderText = "이슈사항";
1289
            gridViewTextBoxColumn6.Name = "AVEVAIssues";
1290
            gridViewTextBoxColumn6.Width = 150;
1299 1291
            gridViewCommandColumn7.EnableExpressionEditor = false;
1300 1292
            gridViewCommandColumn7.FieldName = "ReviewFileName";
1301 1293
            gridViewCommandColumn7.HeaderText = "PDF";
......
1317 1309
            gridViewComboBoxColumn16.Name = "ProdIsResult";
1318 1310
            gridViewComboBoxColumn16.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1319 1311
            gridViewComboBoxColumn16.Width = 70;
1320
            gridViewTextBoxColumn8.EnableExpressionEditor = false;
1321
            gridViewTextBoxColumn8.FieldName = "ProdRemarks";
1322
            gridViewTextBoxColumn8.HeaderText = "비고";
1323
            gridViewTextBoxColumn8.Name = "ProdRemarks";
1324
            gridViewTextBoxColumn8.Width = 150;
1312
            gridViewTextBoxColumn7.EnableExpressionEditor = false;
1313
            gridViewTextBoxColumn7.FieldName = "ProdRemarks";
1314
            gridViewTextBoxColumn7.HeaderText = "비고";
1315
            gridViewTextBoxColumn7.Name = "ProdRemarks";
1316
            gridViewTextBoxColumn7.Width = 150;
1325 1317
            gridViewImageColumn3.HeaderText = "캡쳐";
1326 1318
            gridViewImageColumn3.Name = "ProdCapture";
1327 1319
            gridViewComboBoxColumn17.EnableExpressionEditor = false;
......
1336 1328
            gridViewComboBoxColumn18.Name = "ClientIsResult";
1337 1329
            gridViewComboBoxColumn18.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1338 1330
            gridViewComboBoxColumn18.Width = 70;
1339
            gridViewTextBoxColumn9.EnableExpressionEditor = false;
1340
            gridViewTextBoxColumn9.FieldName = "ClientRemarks";
1341
            gridViewTextBoxColumn9.HeaderText = "비고";
1342
            gridViewTextBoxColumn9.Name = "ClientRemarks";
1343
            gridViewTextBoxColumn9.Width = 150;
1331
            gridViewTextBoxColumn8.EnableExpressionEditor = false;
1332
            gridViewTextBoxColumn8.FieldName = "ClientRemarks";
1333
            gridViewTextBoxColumn8.HeaderText = "비고";
1334
            gridViewTextBoxColumn8.Name = "ClientRemarks";
1335
            gridViewTextBoxColumn8.Width = 150;
1344 1336
            gridViewImageColumn4.HeaderText = "캡쳐";
1345 1337
            gridViewImageColumn4.Name = "ClientCapture";
1346 1338
            gridViewComboBoxColumn19.EnableExpressionEditor = false;
......
1361 1353
            gridViewComboBoxColumn21.Name = "DTIsRegSystem";
1362 1354
            gridViewComboBoxColumn21.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1363 1355
            gridViewComboBoxColumn21.Width = 80;
1364
            gridViewTextBoxColumn10.EnableExpressionEditor = false;
1365
            gridViewTextBoxColumn10.FieldName = "DTRemarks";
1366
            gridViewTextBoxColumn10.HeaderText = "비고";
1367
            gridViewTextBoxColumn10.Name = "DTRemarks";
1368
            gridViewTextBoxColumn10.Width = 150;
1356
            gridViewTextBoxColumn9.EnableExpressionEditor = false;
1357
            gridViewTextBoxColumn9.FieldName = "DTRemarks";
1358
            gridViewTextBoxColumn9.HeaderText = "비고";
1359
            gridViewTextBoxColumn9.Name = "DTRemarks";
1360
            gridViewTextBoxColumn9.Width = 150;
1369 1361
            this.radGridViewDocuments.MasterTemplate.Columns.AddRange(new Telerik.WinControls.UI.GridViewDataColumn[] {
1370 1362
            gridViewCommandColumn1,
1371 1363
            gridViewCommandColumn2,
......
1392 1384
            gridViewCommandColumn5,
1393 1385
            gridViewDateTimeColumn1,
1394 1386
            gridViewDateTimeColumn2,
1395
            gridViewTextBoxColumn5,
1396 1387
            gridViewComboBoxColumn13,
1397
            gridViewTextBoxColumn6,
1388
            gridViewTextBoxColumn5,
1398 1389
            gridViewCommandColumn6,
1399 1390
            gridViewDateTimeColumn3,
1400 1391
            gridViewDateTimeColumn4,
1401 1392
            gridViewComboBoxColumn14,
1402
            gridViewTextBoxColumn7,
1393
            gridViewTextBoxColumn6,
1403 1394
            gridViewCommandColumn7,
1404 1395
            gridViewCommandColumn8,
1405 1396
            gridViewComboBoxColumn15,
1406 1397
            gridViewComboBoxColumn16,
1407
            gridViewTextBoxColumn8,
1398
            gridViewTextBoxColumn7,
1408 1399
            gridViewImageColumn3,
1409 1400
            gridViewComboBoxColumn17,
1410 1401
            gridViewComboBoxColumn18,
1411
            gridViewTextBoxColumn9,
1402
            gridViewTextBoxColumn8,
1412 1403
            gridViewImageColumn4,
1413 1404
            gridViewComboBoxColumn19,
1414 1405
            gridViewComboBoxColumn20,
1415 1406
            gridViewComboBoxColumn21,
1416
            gridViewTextBoxColumn10});
1407
            gridViewTextBoxColumn9});
1417 1408
            this.radGridViewDocuments.MasterTemplate.EnableAlternatingRowColor = true;
1418 1409
            this.radGridViewDocuments.MasterTemplate.EnableFiltering = true;
1419 1410
            this.radGridViewDocuments.MasterTemplate.ShowFilteringRow = false;
ID2.Manager/ID2.Manager/Main.cs
1346 1346
                                    {
1347 1347
                                        doc.ID2StartDate = returnDoc.ID2StartDate;
1348 1348
                                        doc.Worker = returnDoc.Worker;
1349
                                        doc.ID2JobTime = returnDoc.ID2JobTime;
1350 1349
                                    }
1351 1350
                                }
1352 1351
                                catch { }
......
1887 1886
                            templateWorksheet.Cells[rowIndex, 22].Value = doc.ID2Connection;
1888 1887
                            templateWorksheet.Cells[rowIndex, 23].Value = $"{doc.ID2StartDate:yyyy/MM/dd hh:mm:ss}";
1889 1888
                            templateWorksheet.Cells[rowIndex, 24].Value = $"{doc.ID2EndDate:yyyy/MM/dd hh:mm:ss}";
1890
                            templateWorksheet.Cells[rowIndex, 25].Value = doc.ID2JobTime;
1889
                            //templateWorksheet.Cells[rowIndex, 25].Value = doc.ID2JobTime;
1891 1890
                            templateWorksheet.Cells[rowIndex, 26].Value = doc.ID2Status;
1892 1891
                            templateWorksheet.Cells[rowIndex, 27].Value = doc.ID2Issues;
1893 1892
                            templateWorksheet.Cells[rowIndex, 28].Value = doc.AVEVAConnection;
......
2258 2257
            List<string> rvToColNames = new List<string>() { "ToIsDiscussion", "ToRemarks", "ToCreator", "ToCapture", "ToIsMarkup" };
2259 2258
            List<string> rvFrColNames = new List<string>() { "FrReviewStatus", "FrRemarks", "FrCreator", "FrCapture", "FrIsMarkup" };
2260 2259
            List<string> rvEtcColNames = new List<string>() { "IsID2Work" };
2261
            List<string> wkID2ColNames = new List<string>() { "ID2Connection", "ID2StartDate", "ID2EndDate", "ID2JobTime", "ID2Status", "ID2Issues" };
2260
            List<string> wkID2ColNames = new List<string>() { "ID2Connection", "ID2StartDate", "ID2EndDate", "ID2Status", "ID2Issues" };
2262 2261
            List<string> wkAVEVAColNames = new List<string>() { "AVEVAConnection", "AVEVAConvertDate", "AVEVAReviewDate", "AVEVAStatus", "AVEVAIssues" };
2263 2262
            List<string> valLinkColNames = new List<string>() { "ReviewFileName", "SystemLink" };
2264 2263
            List<string> valProdColNames = new List<string>() { "ProdReviewer", "ProdIsResult", "ProdRemarks", "ProdCapture" };

내보내기 Unified diff

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