프로젝트

일반

사용자정보

개정판 c0420a29

IDc0420a293c2c7756b281ea57b49ea0fdf3ff2ea3
상위 10cd10e9
하위 82705273

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

issue #0000
ID2 작업시간 grid 실시간 반영되도록 수정
ID2 시작시간, 종료시간, 작업시간 은 readonly로 수정

Change-Id: Ib3393f4544fab1f4ff749e4d3b7f8e921c22ac0e

차이점 보기:

ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
359 359

  
360 360
if @@rowcount > 0
361 361
begin
362
    select * from dbo.Documents where DocID=@DocID
362
    select *, datediff(SECOND, ID2StartDate, ID2EndDate) as ID2JobTime from dbo.Documents where DocID=@DocID
363 363
end
364 364
else
365 365
begin
366
    select * from dbo.Documents where 1=2
366
    select *, 0 as ID2JobTime from dbo.Documents where 1=2
367 367
end;";
368 368
                            resultData = base.QueryFirstOrDefault<Documents>(query, parameters, transaction);
369 369
                        }
ID2.Manager/ID2.Manager/Main.Designer.cs
431 431
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
432 432
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
433 433
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
434
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 66F));
434
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F));
435 435
            this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
436 436
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 1);
437 437
            this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 1);
......
476 476
            this.radDropDownListFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
477 477
            this.radDropDownListFrReviewStatus.DropDownAnimationEnabled = true;
478 478
            this.radDropDownListFrReviewStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
479
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(347, 32);
479
            this.radDropDownListFrReviewStatus.Location = new System.Drawing.Point(346, 32);
480 480
            this.radDropDownListFrReviewStatus.Name = "radDropDownListFrReviewStatus";
481
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(113, 20);
481
            this.radDropDownListFrReviewStatus.Size = new System.Drawing.Size(112, 20);
482 482
            this.radDropDownListFrReviewStatus.TabIndex = 18;
483 483
            // 
484 484
            // radDropDownListToIsDiscussion
......
488 488
            this.radDropDownListToIsDiscussion.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
489 489
            this.radDropDownListToIsDiscussion.Location = new System.Drawing.Point(141, 32);
490 490
            this.radDropDownListToIsDiscussion.Name = "radDropDownListToIsDiscussion";
491
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(113, 20);
491
            this.radDropDownListToIsDiscussion.Size = new System.Drawing.Size(112, 20);
492 492
            this.radDropDownListToIsDiscussion.TabIndex = 17;
493 493
            // 
494 494
            // radLabelFrReviewStatus
495 495
            // 
496 496
            this.radLabelFrReviewStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
497 497
            this.radLabelFrReviewStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
498
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(261, 34);
498
            this.radLabelFrReviewStatus.Location = new System.Drawing.Point(260, 34);
499 499
            this.radLabelFrReviewStatus.Name = "radLabelFrReviewStatus";
500 500
            this.radLabelFrReviewStatus.Size = new System.Drawing.Size(59, 17);
501 501
            this.radLabelFrReviewStatus.TabIndex = 7;
......
525 525
            // 
526 526
            this.radLabelAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
527 527
            this.radLabelAVEVAStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
528
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(261, 62);
528
            this.radLabelAVEVAStatus.Location = new System.Drawing.Point(260, 62);
529 529
            this.radLabelAVEVAStatus.Name = "radLabelAVEVAStatus";
530 530
            this.radLabelAVEVAStatus.Size = new System.Drawing.Size(86, 17);
531 531
            this.radLabelAVEVAStatus.TabIndex = 8;
......
535 535
            // 
536 536
            this.radLabelIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
537 537
            this.radLabelIsID2Work.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
538
            this.radLabelIsID2Work.Location = new System.Drawing.Point(467, 34);
538
            this.radLabelIsID2Work.Location = new System.Drawing.Point(465, 34);
539 539
            this.radLabelIsID2Work.Name = "radLabelIsID2Work";
540 540
            this.radLabelIsID2Work.Size = new System.Drawing.Size(80, 17);
541 541
            this.radLabelIsID2Work.TabIndex = 6;
......
545 545
            // 
546 546
            this.radLabelJobLevel.Anchor = System.Windows.Forms.AnchorStyles.Left;
547 547
            this.radLabelJobLevel.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
548
            this.radLabelJobLevel.Location = new System.Drawing.Point(467, 6);
548
            this.radLabelJobLevel.Location = new System.Drawing.Point(465, 6);
549 549
            this.radLabelJobLevel.Name = "radLabelJobLevel";
550 550
            this.radLabelJobLevel.Size = new System.Drawing.Size(47, 17);
551 551
            this.radLabelJobLevel.TabIndex = 7;
......
596 596
            this.radButtonSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
597 597
            this.radButtonSearch.Cursor = System.Windows.Forms.Cursors.Hand;
598 598
            this.radButtonSearch.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
599
            this.radButtonSearch.Location = new System.Drawing.Point(883, 4);
599
            this.radButtonSearch.Location = new System.Drawing.Point(881, 4);
600 600
            this.radButtonSearch.Name = "radButtonSearch";
601 601
            this.tableLayoutPanelCondition.SetRowSpan(this.radButtonSearch, 4);
602 602
            this.radButtonSearch.Size = new System.Drawing.Size(54, 106);
......
610 610
            this.radDropDownListProject.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
611 611
            this.radDropDownListProject.Location = new System.Drawing.Point(141, 4);
612 612
            this.radDropDownListProject.Name = "radDropDownListProject";
613
            this.radDropDownListProject.Size = new System.Drawing.Size(113, 20);
613
            this.radDropDownListProject.Size = new System.Drawing.Size(112, 20);
614 614
            this.radDropDownListProject.TabIndex = 7;
615 615
            // 
616 616
            // radLabelDocumentNo
617 617
            // 
618 618
            this.radLabelDocumentNo.Anchor = System.Windows.Forms.AnchorStyles.Left;
619 619
            this.radLabelDocumentNo.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
620
            this.radLabelDocumentNo.Location = new System.Drawing.Point(673, 6);
620
            this.radLabelDocumentNo.Location = new System.Drawing.Point(670, 6);
621 621
            this.radLabelDocumentNo.Name = "radLabelDocumentNo";
622
            this.radLabelDocumentNo.Size = new System.Drawing.Size(56, 17);
622
            this.radLabelDocumentNo.Size = new System.Drawing.Size(49, 17);
623 623
            this.radLabelDocumentNo.TabIndex = 6;
624 624
            this.radLabelDocumentNo.Text = "도면 ID";
625 625
            // 
626 626
            // radTextBoxDocumentNo
627 627
            // 
628 628
            this.radTextBoxDocumentNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
629
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(759, 4);
629
            this.radTextBoxDocumentNo.Location = new System.Drawing.Point(756, 4);
630 630
            this.radTextBoxDocumentNo.Name = "radTextBoxDocumentNo";
631
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(113, 20);
631
            this.radTextBoxDocumentNo.Size = new System.Drawing.Size(112, 20);
632 632
            this.radTextBoxDocumentNo.TabIndex = 8;
633 633
            // 
634 634
            // radLabelPersonInCharge
635 635
            // 
636 636
            this.radLabelPersonInCharge.Anchor = System.Windows.Forms.AnchorStyles.Left;
637 637
            this.radLabelPersonInCharge.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
638
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(261, 6);
638
            this.radLabelPersonInCharge.Location = new System.Drawing.Point(260, 6);
639 639
            this.radLabelPersonInCharge.Name = "radLabelPersonInCharge";
640 640
            this.radLabelPersonInCharge.Size = new System.Drawing.Size(47, 17);
641 641
            this.radLabelPersonInCharge.TabIndex = 6;
......
646 646
            this.radDropDownListPersonInCharge.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
647 647
            this.radDropDownListPersonInCharge.DropDownAnimationEnabled = true;
648 648
            this.radDropDownListPersonInCharge.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
649
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(347, 4);
649
            this.radDropDownListPersonInCharge.Location = new System.Drawing.Point(346, 4);
650 650
            this.radDropDownListPersonInCharge.Name = "radDropDownListPersonInCharge";
651
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(113, 20);
651
            this.radDropDownListPersonInCharge.Size = new System.Drawing.Size(112, 20);
652 652
            this.radDropDownListPersonInCharge.TabIndex = 9;
653 653
            // 
654 654
            // radLabel1
......
666 666
            this.radDropDownListJobLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
667 667
            this.radDropDownListJobLevel.DropDownAnimationEnabled = true;
668 668
            this.radDropDownListJobLevel.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
669
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(553, 4);
669
            this.radDropDownListJobLevel.Location = new System.Drawing.Point(551, 4);
670 670
            this.radDropDownListJobLevel.Name = "radDropDownListJobLevel";
671
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(113, 20);
671
            this.radDropDownListJobLevel.Size = new System.Drawing.Size(112, 20);
672 672
            this.radDropDownListJobLevel.TabIndex = 11;
673 673
            // 
674 674
            // radLabelID2Status
......
685 685
            // 
686 686
            this.radLabel10.Anchor = System.Windows.Forms.AnchorStyles.Left;
687 687
            this.radLabel10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
688
            this.radLabel10.Location = new System.Drawing.Point(261, 90);
688
            this.radLabel10.Location = new System.Drawing.Point(260, 90);
689 689
            this.radLabel10.Name = "radLabel10";
690 690
            this.radLabel10.Size = new System.Drawing.Size(61, 17);
691 691
            this.radLabel10.TabIndex = 9;
......
696 696
            this.radDropDownListIsID2Work.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
697 697
            this.radDropDownListIsID2Work.DropDownAnimationEnabled = true;
698 698
            this.radDropDownListIsID2Work.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
699
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(553, 32);
699
            this.radDropDownListIsID2Work.Location = new System.Drawing.Point(551, 32);
700 700
            this.radDropDownListIsID2Work.Name = "radDropDownListIsID2Work";
701
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(113, 20);
701
            this.radDropDownListIsID2Work.Size = new System.Drawing.Size(112, 20);
702 702
            this.radDropDownListIsID2Work.TabIndex = 12;
703 703
            // 
704 704
            // radDropDownListID2Status
......
708 708
            this.radDropDownListID2Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
709 709
            this.radDropDownListID2Status.Location = new System.Drawing.Point(141, 60);
710 710
            this.radDropDownListID2Status.Name = "radDropDownListID2Status";
711
            this.radDropDownListID2Status.Size = new System.Drawing.Size(113, 20);
711
            this.radDropDownListID2Status.Size = new System.Drawing.Size(112, 20);
712 712
            this.radDropDownListID2Status.TabIndex = 13;
713 713
            // 
714 714
            // radDropDownListAVEVAStatus
......
716 716
            this.radDropDownListAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
717 717
            this.radDropDownListAVEVAStatus.DropDownAnimationEnabled = true;
718 718
            this.radDropDownListAVEVAStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
719
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(347, 60);
719
            this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(346, 60);
720 720
            this.radDropDownListAVEVAStatus.Name = "radDropDownListAVEVAStatus";
721
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(113, 20);
721
            this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(112, 20);
722 722
            this.radDropDownListAVEVAStatus.TabIndex = 14;
723 723
            // 
724 724
            // radDropDownListProdIsResult
......
728 728
            this.radDropDownListProdIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
729 729
            this.radDropDownListProdIsResult.Location = new System.Drawing.Point(141, 89);
730 730
            this.radDropDownListProdIsResult.Name = "radDropDownListProdIsResult";
731
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(113, 20);
731
            this.radDropDownListProdIsResult.Size = new System.Drawing.Size(112, 20);
732 732
            this.radDropDownListProdIsResult.TabIndex = 15;
733 733
            // 
734 734
            // radDropDownListClientIsResult
......
736 736
            this.radDropDownListClientIsResult.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
737 737
            this.radDropDownListClientIsResult.DropDownAnimationEnabled = true;
738 738
            this.radDropDownListClientIsResult.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
739
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(347, 89);
739
            this.radDropDownListClientIsResult.Location = new System.Drawing.Point(346, 89);
740 740
            this.radDropDownListClientIsResult.Name = "radDropDownListClientIsResult";
741
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(113, 20);
741
            this.radDropDownListClientIsResult.Size = new System.Drawing.Size(112, 20);
742 742
            this.radDropDownListClientIsResult.TabIndex = 16;
743 743
            // 
744 744
            // tableLayoutPanelGroup
......
907 907
            gridViewComboBoxColumn3.FieldName = "Worker";
908 908
            gridViewComboBoxColumn3.HeaderText = "작업자";
909 909
            gridViewComboBoxColumn3.Name = "Worker";
910
            gridViewComboBoxColumn3.ReadOnly = true;
910 911
            gridViewComboBoxColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
911 912
            gridViewComboBoxColumn3.Width = 100;
912 913
            gridViewComboBoxColumn4.EnableExpressionEditor = false;
......
1000 1001
            gridViewDateTimeColumn1.FormatString = "{0: yyyy/MM/dd HH:mm:ss}";
1001 1002
            gridViewDateTimeColumn1.HeaderText = "시작일";
1002 1003
            gridViewDateTimeColumn1.Name = "ID2StartDate";
1004
            gridViewDateTimeColumn1.ReadOnly = true;
1003 1005
            gridViewDateTimeColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1004 1006
            gridViewDateTimeColumn1.Width = 120;
1005 1007
            gridViewDateTimeColumn2.EnableExpressionEditor = false;
......
1008 1010
            gridViewDateTimeColumn2.FormatString = "{0: yyyy/MM/dd HH:mm:ss}";
1009 1011
            gridViewDateTimeColumn2.HeaderText = "완료일";
1010 1012
            gridViewDateTimeColumn2.Name = "ID2EndDate";
1013
            gridViewDateTimeColumn2.ReadOnly = true;
1011 1014
            gridViewDateTimeColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1012 1015
            gridViewDateTimeColumn2.Width = 120;
1013 1016
            gridViewTextBoxColumn5.EnableExpressionEditor = false;
1014 1017
            gridViewTextBoxColumn5.FieldName = "ID2JobTimetoString";
1015 1018
            gridViewTextBoxColumn5.HeaderText = "작업시간";
1016 1019
            gridViewTextBoxColumn5.Name = "ID2JobTime";
1020
            gridViewTextBoxColumn5.ReadOnly = true;
1017 1021
            gridViewTextBoxColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
1018 1022
            gridViewTextBoxColumn5.Width = 80;
1019 1023
            gridViewComboBoxColumn13.EnableExpressionEditor = false;
ID2.Manager/ID2.Manager/Main.cs
790 790
                                    {
791 791
                                        doc.ID2StartDate = returnDoc.ID2StartDate;
792 792
                                        doc.Worker = returnDoc.Worker;
793
                                        doc.ID2JobTime = returnDoc.ID2JobTime;
793 794
                                    }
794 795
                                }
795 796
                                catch { }
......
797 798
                        }
798 799
                        catch (Exception ex)
799 800
                        {
801
                            if (e.Row.DataBoundItem is Documents doc)
802
                            {
803
                                try
804
                                {
805
                                    var returnDoc = new DocumentController().SetID2Worker(new Documents()
806
                                    {
807
                                        DocID = doc.DocID,
808
                                        ID2StartDate = DateTime.Now,
809
                                        Worker = informations.ActiveUser.ID
810
                                    }, informations.ActiveUser.ID);
811

  
812
                                    if (returnDoc != null)
813
                                    {
814
                                        doc.ID2StartDate = returnDoc.ID2StartDate;
815
                                        doc.Worker = returnDoc.Worker;
816
                                        doc.ID2JobTime = returnDoc.ID2JobTime;
817
                                    }
818
                                }
819
                                catch { }
820
                            }
821

  
800 822
                            RadMessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, RadMessageIcon.Error);
801 823
                        }
802 824
                        break;

내보내기 Unified diff

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