개정판 c854511f
issue #111101 PEMSS Comment 선택 이동에서 페이지 변경문제 해결
Change-Id: I08f30e404b7032a7183879e71061ff3f93b71d96
| KCOM/ViewModel/RequirementViewModel.cs | ||
|---|---|---|
| 176 | 176 |
{
|
| 177 | 177 |
selectedComment = null; |
| 178 | 178 |
} |
| 179 |
else |
|
| 180 |
{
|
|
| 181 |
SelectRequirement = (obj as Telerik.Windows.Controls.GridView.GridViewRow).DataContext as Requirement; |
|
| 182 |
} |
|
| 183 | 179 |
|
| 184 | 180 |
if (SelectRequirement != null && SelectionSet.Instance.SelectedItems?.Count() > 0) |
| 185 | 181 |
{
|
| ... | ... | |
| 230 | 226 |
|
| 231 | 227 |
private void OnDelVPCommentCommand(object obj) |
| 232 | 228 |
{
|
| 233 |
if(obj is Telerik.Windows.Controls.GridView.GridViewRow)
|
|
| 229 |
if(obj is VpCommant)
|
|
| 234 | 230 |
{
|
| 235 |
selectedComment = (obj as Telerik.Windows.Controls.GridView.GridViewRow).DataContext as VpCommant;
|
|
| 231 |
selectedComment = obj as VpCommant;
|
|
| 236 | 232 |
|
| 237 | 233 |
var parameters = new DialogParameters() |
| 238 | 234 |
{
|
| ... | ... | |
| 299 | 295 |
//var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup; |
| 300 | 296 |
|
| 301 | 297 |
//var markuplist = (gridMarkup.ItemsSource as IEnumerable<IKCOM.MarkupInfoItem>).SelectMany(x => x.MarkupList); |
| 298 |
var instance = Common.ViewerDataModel.Instance; |
|
| 302 | 299 |
|
| 303 |
var infoList = Common.ViewerDataModel.Instance._markupInfoList.Where(x=>x.MarkupList != null).SelectMany(x => x.MarkupList).Where(f => f.ID == CommentIdList.First());
|
|
| 300 |
var commentList = instance._markupInfoList.Where(x=>x.MarkupList != null).SelectMany(x => x.MarkupList).Where(f => f.ID == CommentIdList.First());
|
|
| 304 | 301 |
|
| 305 |
if (infoList.Count() > 0)
|
|
| 302 |
if (commentList.Count() > 0)
|
|
| 306 | 303 |
{
|
| 307 |
var pageNavigator = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator; |
|
| 304 |
//하단 그리드의 markup list에서 commentid가 포함된 markupinfo를 선택되게 한다. |
|
| 305 |
#region markup list grid select items |
|
| 306 |
|
|
| 307 |
var infoItem = instance._markupInfoList.Where(x => x.MarkupList != null).Where(f => f.MarkupList.Count(y => y == commentList.First()) > 0); |
|
| 308 |
|
|
| 309 |
if (infoItem.Count() > 0) |
|
| 310 |
{
|
|
| 311 |
var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup; |
|
| 312 |
gridMarkup.SelectedItems.Add(infoItem.First()); |
|
| 313 |
} |
|
| 314 |
|
|
| 315 |
#endregion |
|
| 308 | 316 |
|
| 309 |
pageNavigator.GotoPage(infoList.First().PageNumber); |
|
| 317 |
var pageNavigator = instance.SystemMain.dzMainMenu.pageNavigator; |
|
| 318 |
|
|
| 319 |
pageNavigator.GotoPage(commentList.First().PageNumber); |
|
| 310 | 320 |
|
| 311 | 321 |
pageNavigator.PageChanged += (snd, evt) => |
| 312 | 322 |
{
|
| 313 |
var selectComments = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList(); |
|
| 323 |
var selectOrderComments = instance.MarkupControls.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList(); |
|
| 324 |
var selectMyComments = instance.MarkupControls_USER.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList(); |
|
| 314 | 325 |
|
| 315 |
if (selectComments.Count() > 0) |
|
| 326 |
if (selectMyComments.Count() > 0 || selectOrderComments.Count() > 0)
|
|
| 316 | 327 |
{
|
| 317 |
selectComments.ForEach(x => x.IsSelected = true); |
|
| 318 |
GotoMarkup(selectComments); |
|
| 328 |
selectMyComments.ForEach(x => x.IsSelected = true); |
|
| 329 |
selectMyComments.AddRange(selectOrderComments); |
|
| 330 |
|
|
| 331 |
GotoMarkup(selectMyComments); |
|
| 319 | 332 |
} |
| 320 | 333 |
}; |
| 321 | 334 |
} |
내보내기 Unified diff
