프로젝트

일반

사용자정보

개정판 41e2e4cb

ID41e2e4cbfff35768b7a940ad9387ca6f61db0ae3
상위 49b217ad
하위 7c0fea12

humkyung 이(가) 6년 이상 전에 추가함

Fixed issue #77: Export 화면 메세지 오류 수정

차이점 보기:

KCOM/Controls/PrintControl.xaml.cs
320 320
            if (!_initializeComponentFinished) return;
321 321

  
322 322
            string _ButtonName = (sender as RadRadioButton).Tag.ToString();
323
            totalPage_Whole.Text = "";
324 323
            CommentPageList.ItemsSource = null;
325 324

  
326 325
            switch (_ButtonName)
......
399 398

  
400 399
        private void gridViewMarkup_SelectionChanged(object sender, SelectionChangeEventArgs e)
401 400
        {
402
            //_PageMarkupList.Clear();
403

  
404
            if (gridViewMarkup.SelectedItems.Count() > 0)
405
            {
406
                //foreach (var info in gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>())
407
                //{
408
                //    info.MarkupList.ForEach(makup =>
409
                //    {
410
                //        var _pageMarkup = _PageMarkupList.Where(item => item.PageNumber == makup.PageNumber);
411
                //        var _SetMarkupItem = new SetColorMarkupItem { markupID = makup.ID, DisplayColor = info.DisplayColor };
412

  
413
                //        if (_pageMarkup.Count() > 0)
414
                //            _pageMarkup.First().DisplayColorItems.Add(_SetMarkupItem);
415
                //        else
416
                //            _PageMarkupList.Add(new MarkupPageItem
417
                //            {
418
                //                PageNumber = makup.PageNumber,
419
                //                DisplayColorItems = new List<SetColorMarkupItem> { _SetMarkupItem }
420
                //            });
421
                //    });
422
                //}
423

  
424
                //SetLoadMakupList(this.CurrentPageNo);
425

  
426
                //페이지 보여주는 부분 변경(강인구)
427
                totalPage_Selected.Text = gridViewMarkup.SelectedItems.Cast<IKCOM.MarkupInfoItem>().Sum(p => p.MarkupList.GroupBy(c => c.PageNumber).Count()).ToString();
428
            }
429
            else
430
            {
431
                totalPage_Selected.Text = "0";
432
            }
433

  
434 401
            if (_initializeComponentFinished)
435 402
            {
436 403
                PageChanged(this.CurrentPageNo);
437
                //CheckCommentPages();
438 404
            }
439 405
        }
440 406

  
......
677 643
                          where commPage.PageNumber == CurrentPageNo
678 644
                          orderby commPage.PageNumber
679 645
                          select commPage).ToList();
680

  
681
                if (chkOnlyMarkup.IsChecked == true)
682
                {
683
                    totalPage_Whole.Text = _pages.Count().ToString();
684
                }
685
                else
686
                {
687
                    totalPage_Whole.Text = "1";
688
                }
689 646
            }
690 647
            else if (GridRangePages.Visibility == System.Windows.Visibility.Visible)
691 648
            {
......
699 656
                          where commPage.PageNumber >= _stPage && commPage.PageNumber <= _edPage
700 657
                          orderby commPage.PageNumber
701 658
                          select commPage).ToList();
702

  
703
                if (chkOnlyMarkup.IsChecked == true)
704
                {
705
                    totalPage_Whole.Text = _pages.Count().ToString();
706
                }
707
                else
708
                {
709
                    if (_stPage == _edPage)
710
                    {
711
                        totalPage_Whole.Text = "1";
712
                    }
713
                    else
714
                    {
715
                        totalPage_Whole.Text = ((_edPage - _stPage) + 1).ToString();
716
                    }
717
                }
718 659
            }
719

  
720

  
721

  
722 660
            else if (GridDefinePages.Visibility == System.Windows.Visibility.Visible)
723 661
            {
724 662
                stPageNo.Value = stPageNo.Value == null ? 1 : stPageNo.Value;
......
734 672
                          where commPage.PageNumber == compareData
735 673
                          orderby commPage.PageNumber
736 674
                          select commPage).ToList();
737

  
738
                if (chkOnlyMarkup.IsChecked == true)
739
                {
740
                    totalPage_Whole.Text = _pages.Count().ToString();
741
                }
742
                else
743
                {
744
                    totalPage_Whole.Text = lst.Count().ToString();
745
                }
746 675
            }
747 676
            else
748 677
            {
749 678
                _pages = (from commPage in this._PageMarkupList
750 679
                          orderby commPage.PageNumber
751 680
                          select commPage).ToList();
752

  
753
                if (chkOnlyMarkup.IsChecked == true)
754
                {
755
                    totalPage_Whole.Text = _pages.Count().ToString();
756

  
757
                }
758
                else
759
                {
760
                    totalPage_Whole.Text = _definePages.PagesCount.ToString();
761
                }
762 681
            }
763 682
            CommentPageList.ItemsSource = _pages.ToList();
764 683
        }

내보내기 Unified diff

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