개정판 53deabaf
- markup list 전체 선택 체크박스 추가
- Export 기능 수정
Change-Id: Id37ea925d0296c7bb2115ff00df280b13258f9bd
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 380 | 380 |
MarkupInfoID = d.MarkupInfoID, |
| 381 | 381 |
PageNumber = p.PageNumber, |
| 382 | 382 |
Symbol_ID = p.Symbol_ID, |
| 383 |
//Group_ID = p.Group_ID |
|
| 384 |
}; |
|
| 383 |
//Group_ID = p.Group_ID
|
|
| 384 |
};
|
|
| 385 | 385 |
ViewerDataModel.Instance.MyMarkupList.Add(markup); |
| 386 | 386 |
} |
| 387 | 387 |
else |
| ... | ... | |
| 395 | 395 |
MarkupInfoID = d.MarkupInfoID, |
| 396 | 396 |
PageNumber = p.PageNumber, |
| 397 | 397 |
Symbol_ID = p.Symbol_ID, |
| 398 |
//Group_ID = p.Group_ID |
|
| 399 |
}; |
|
| 398 |
//Group_ID = p.Group_ID
|
|
| 399 |
};
|
|
| 400 | 400 |
ViewerDataModel.Instance.MarkupList_Pre.Add(markup); |
| 401 | 401 |
} |
| 402 | 402 |
}); |
| ... | ... | |
| 448 | 448 |
//var markupItem = ViewerDataModel.Instance._markupInfoList.OrderByDescending(p => p.Consolidate == Convert.ToInt32(true)).ToList(); |
| 449 | 449 |
|
| 450 | 450 |
gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList; |
| 451 |
|
|
| 451 | 452 |
SetCommentPages(); |
| 452 | 453 |
|
| 453 | 454 |
// GRIDVIEW에서 팀별 GROUPING |
| ... | ... | |
| 463 | 464 |
gridViewMarkup.GroupDescriptors.Add(descriptor); |
| 464 | 465 |
#endif |
| 465 | 466 |
|
| 466 |
GridViewMarkup_Sorting(gridViewMarkup,new GridViewSortingEventArgs(gridViewMarkup.Columns[0],SortingState.None,SortingState.None));
|
|
| 467 |
GridViewMarkup_Sorting(gridViewMarkup, new GridViewSortingEventArgs(gridViewMarkup.Columns[0], SortingState.None, SortingState.None));
|
|
| 467 | 468 |
|
| 468 | 469 |
var SelectedItem = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.UpdateTime).FirstOrDefault(); |
| 469 |
this.gridViewMarkup.SelectedItem = (PreviewUserMarkupInfoItem != null) ? PreviewUserMarkupInfoItem : SelectedItem; |
|
| 470 |
|
|
| 471 |
if (PreviewUserMarkupInfoItem != null) |
|
| 472 |
{
|
|
| 473 |
this.gridViewMarkup.SelectedItem = PreviewUserMarkupInfoItem; |
|
| 474 |
} |
|
| 475 |
else if (SelectedItem != null) |
|
| 476 |
{
|
|
| 477 |
this.gridViewMarkup.SelectedItem = SelectedItem; |
|
| 478 |
} |
|
| 479 |
else if(ViewerDataModel.Instance._markupInfoList.Count() > 0) |
|
| 480 |
{
|
|
| 481 |
this.gridViewMarkup.SelectedItem = ViewerDataModel.Instance._markupInfoList.First(); |
|
| 482 |
} |
|
| 470 | 483 |
} |
| 471 | 484 |
} |
| 472 | 485 |
|
내보내기 Unified diff
