개정판 053f2163
Fix: 프로그램 로딩 후 처음으로 마크업 항목을 선택하는 로직 수정(1)
Change-Id: I9e8ecc9bc9887f4074fa6c833a80f98a704aba22
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 567 | 567 |
Consolidates.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
| 568 | 568 |
} |
| 569 | 569 |
#endregion |
| 570 |
#region Consolidate 항목이 없을 경우에는 AvoidConsolidate를 제외한 모든 항목들을 선택
|
|
| 570 |
#region Consolidate 항목이 없을 경우에는 사용자 별로 AvoidConsolidate를 제외한 우선 순위가 높은(Team,Comment)항목들을 선택
|
|
| 571 | 571 |
else |
| 572 | 572 |
{
|
| 573 |
var Consolidates = ViewerDataModel.Instance._markupInfoList.Where(x => x.AvoidConsolidate == 0).ToList(); |
|
| 574 |
Consolidates.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
|
| 573 |
var MarkupInfoColl = ViewerDataModel.Instance._markupInfoList.Where(x => x.AvoidConsolidate == 0).ToList(); |
|
| 574 |
|
|
| 575 |
#region Team consolidate 항목 선택 |
|
| 576 |
var Candidates = MarkupInfoColl.Where(x => x.PartConsolidate == 1 && x.AvoidConsolidate == 0).ToList(); |
|
| 577 |
MarkupInfoColl.RemoveAll(x => Candidates.Exists(y => y.UserID == x.UserID)); |
|
| 578 |
#endregion |
|
| 579 |
|
|
| 580 |
#region 추가되지 않은 사용자들을 추가 |
|
| 581 |
foreach (var item in MarkupInfoColl.Where(x => !Candidates.Exists(y => y.UserID == x.UserID))) |
|
| 582 |
{
|
|
| 583 |
Candidates.Add(item); |
|
| 584 |
} |
|
| 585 |
#endregion |
|
| 586 |
|
|
| 587 |
Candidates.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
|
| 575 | 588 |
} |
| 576 | 589 |
#endregion |
| 577 | 590 |
} |
| ... | ... | |
| 580 | 593 |
var MarkupInfoColl = ViewerDataModel.Instance._markupInfoList.Where(x => x.AvoidConsolidate == 0).ToList(); |
| 581 | 594 |
|
| 582 | 595 |
#region Team consolidate 항목 선택 |
| 583 |
var Candidates = MarkupInfoColl.Where(x => x.PartConsolidate == 1).ToList(); |
|
| 584 |
MarkupInfoColl.RemoveAll(x => Candidates.Exists(y => y == x));
|
|
| 596 |
var Candidates = MarkupInfoColl.Where(x => x.PartConsolidate == 1 && x.AvoidConsolidate == 0).ToList();
|
|
| 597 |
MarkupInfoColl.RemoveAll(x => Candidates.Exists(y => y.UserID == x.UserID));
|
|
| 585 | 598 |
#endregion |
| 586 | 599 |
|
| 587 | 600 |
#region 추가되지 않은 사용자들을 추가 |
| ... | ... | |
| 593 | 606 |
|
| 594 | 607 |
Candidates.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
| 595 | 608 |
} |
| 596 |
else if (App.ViewInfo.CreateFinalPDFPermission && App.ViewInfo.NewCommentPermission) /// Orig Comment Model
|
|
| 609 |
else if (App.ViewInfo.CreateFinalPDFPermission) /// Orig Comment Model |
|
| 597 | 610 |
{
|
| 598 | 611 |
if (ViewerDataModel.Instance._markupInfoList.Any(x => x.Consolidate == 1 && x.AvoidConsolidate == 0)) |
| 599 | 612 |
{
|
| 600 | 613 |
var Consolidates = ViewerDataModel.Instance._markupInfoList.Where(x => x.Consolidate == 1 && x.AvoidConsolidate == 0).ToList(); |
| 601 | 614 |
Consolidates.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
| 602 | 615 |
} |
| 603 |
else if (ViewerDataModel.Instance._markupInfoList.Any(x => x.PartConsolidate == 1)) |
|
| 616 |
else if (ViewerDataModel.Instance._markupInfoList.Any(x => x.PartConsolidate == 1 && x.AvoidConsolidate == 0))
|
|
| 604 | 617 |
{
|
| 605 |
var PartConsolidates = ViewerDataModel.Instance._markupInfoList.Where(x => x.PartConsolidate == 1).ToList(); |
|
| 606 |
PartConsolidates.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
|
| 618 |
var MarkupInfoColl = ViewerDataModel.Instance._markupInfoList.Where(x => x.AvoidConsolidate == 0).ToList(); |
|
| 619 |
|
|
| 620 |
#region Team consolidate 항목 선택 |
|
| 621 |
var Candidates = MarkupInfoColl.Where(x => x.PartConsolidate == 1 && x.AvoidConsolidate == 0).ToList(); |
|
| 622 |
MarkupInfoColl.RemoveAll(x => Candidates.Exists(y => y.UserID == x.UserID)); |
|
| 623 |
#endregion |
|
| 624 |
|
|
| 625 |
#region 추가되지 않은 사용자들을 추가 |
|
| 626 |
foreach (var item in MarkupInfoColl.Where(x => !Candidates.Exists(y => y.UserID == x.UserID))) |
|
| 627 |
{
|
|
| 628 |
Candidates.Add(item); |
|
| 629 |
} |
|
| 630 |
#endregion |
|
| 631 |
|
|
| 632 |
Candidates.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
|
| 607 | 633 |
} |
| 608 | 634 |
else |
| 609 | 635 |
{
|
| 610 |
var Comments = ViewerDataModel.Instance._markupInfoList.Where(x => x.Consolidate != 1 && x.AvoidConsolidate != 1).ToList();
|
|
| 636 |
var Comments = ViewerDataModel.Instance._markupInfoList.Where(x => x.Consolidate == 0 && x.AvoidConsolidate == 0).ToList();
|
|
| 611 | 637 |
Comments.ForEach(x => gridViewMarkup.SelectedItems.Add(x)); |
| 612 | 638 |
} |
| 613 | 639 |
} |
내보내기 Unified diff
