프로젝트

일반

사용자정보

개정판 9598eb6e

ID9598eb6e502e85083c425b7e6b1d20f886d57116
상위 077ee0f2
하위 ccd4ccb7

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

issue #0000
- grid에서 delete 키로 row삭제되지 않도록 수정
- app title 에 버전정보 표시
- manager 권한 조회 onload로 이동
- checked 시 바로 반영되도록 수정
- excel import 완료 후 완료메세지 팝업되도록 수정
- dwg 삭제 완료 후 완료 메세지 팝업되도록 수정
- convert 호출 시 checked list 조회부분 수정
- documents 클래스 checked member 삭제

Change-Id: I3686505b6896b1d2d26d795fabe00452d7363c88

차이점 보기:

ID2.Manager/ID2.Manager.Data/Models/Documents.cs
16 16
    public class Documents : NotifyPropertyChange, IEquatable<Documents>
17 17
    {
18 18
        //[DataMember]
19
        public bool Checked { get; set; }
20
        //[DataMember]
21 19
        public int Seq { get; set; }
22 20
        //[DataMember]
23 21
        public string DocID { get; set; }
ID2.Manager/ID2.Manager/Main.Designer.cs
685 685
            // 
686 686
            // 
687 687
            this.radGridViewDocuments.MasterTemplate.AllowColumnHeaderContextMenu = false;
688
            this.radGridViewDocuments.MasterTemplate.AllowDeleteRow = false;
688 689
            this.radGridViewDocuments.MasterTemplate.AutoGenerateColumns = false;
689 690
            this.radGridViewDocuments.MasterTemplate.ChildViewTabsPosition = Telerik.WinControls.UI.TabPositions.Bottom;
690 691
            gridViewCheckBoxColumn1.CheckFilteredRows = false;
ID2.Manager/ID2.Manager/Main.cs
596 596
        #region Init, Load
597 597
        private void Initialize()
598 598
        {
599
            this.Text = Globals.Name;
599
            this.Text = $"{Globals.Name} (Ver : {Application.ProductVersion})";
600 600

  
601 601
            this.ID2ManagerRadRibbonBar.Expanded = false;
602 602

  
......
609 609
            {
610 610
                LoadDockingLayout();
611 611
                this.radDropDownButtonElementTheme.Text = Program.ThemeName;
612

  
613
                this.IsID2Manager = (new string[] { "Admin", "Manager" }).Contains(informations.ActiveUser.Role) && string.IsNullOrEmpty(informations.ActiveUser.RefProjectID);
614

  
612 615
                InitializeGrid();
613 616

  
614 617
                bool isID2DB = this.IsID2Connection();
......
681 684
        {
682 685
            if (isid2)
683 686
            {
684
                this.IsID2Manager = (new string[] { "Admin", "Manager" }).Contains(informations.ActiveUser.Role) && string.IsNullOrEmpty(informations.ActiveUser.RefProjectID);
685

  
686 687
                if (this.IsID2Manager)
687 688
                {
688 689
                    this.radButtonElementNoticeUpload.Enabled = true;
......
1947 1948
                        {
1948 1949
                            switch (cellElem.ColumnInfo.Name)
1949 1950
                            {
1951
                                case "Checked":
1950 1952
                                case "RefProjectCode":
1951 1953
                                case "PersonInCharge":
1952 1954
                                case "Worker":
......
2042 2044
                        if (this.orgDocuments == null) this.orgDocuments = new List<Documents>();
2043 2045
                        this.DocumentListBinding(false);
2044 2046
                        //briefAndImagesReview.SetImages(this.importImages);
2047

  
2048
                        RadMessageBox.Show("Import is complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
2045 2049
                    }
2046 2050

  
2047 2051
                }
......
2333 2337
                        {
2334 2338
                            this.documents.Remove(qChkData.Dequeue());
2335 2339
                        }
2336
                        //RadMessageBox.Show("Delete is complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
2340
                        RadMessageBox.Show("Delete is complete", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
2337 2341
                        this.DocumentListBinding(false);
2338 2342
                    }
2339 2343
                }
......
2358 2362
        {
2359 2363
            if (radGridViewDocuments.SelectedRows?.Count() > 0)
2360 2364
            {
2361
                List<Documents> checkedDocList = this.documents.Where(x => x.Checked).ToList();
2365
                List<Documents> checkedDocList = this.GetCheckedDatas(true).ToList();
2362 2366

  
2363
                if (checkedDocList.Count() > 1)
2367
                if (checkedDocList.Count > 1)
2364 2368
                {
2365 2369
                    MarkusConvertWorker convertWorker = new MarkusConvertWorker(checkedDocList.ToList(),radGridViewDocuments);
2366 2370

  

내보내기 Unified diff

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