개정판 3ffd4b2d
issue #923: fixed page change logic
Change-Id: I903f39391fca4a6ae241ba86b131f2aeed7c14a8
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 272 | 272 |
if (e.Result != null) |
| 273 | 273 |
{
|
| 274 | 274 |
ViewerDataModel.Instance._markupInfoList.Clear(); |
| 275 |
if (e.Result.Count > 0) |
|
| 276 |
{
|
|
| 277 |
ViewerDataModel.Instance.MyMarkupList.Clear(); |
|
| 278 |
} |
|
| 275 |
if (e.Result.Count > 0) ViewerDataModel.Instance.MyMarkupList.Clear(); |
|
| 279 | 276 |
|
| 280 | 277 |
foreach(var info in e.Result) |
| 281 | 278 |
{
|
| ... | ... | |
| 310 | 307 |
//Group_ID = p.Group_ID |
| 311 | 308 |
}; |
| 312 | 309 |
ViewerDataModel.Instance.MyMarkupList.Add(markup); |
| 313 |
|
|
| 314 |
var control = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, d.DisplayColor, "", |
|
| 315 |
d.MarkupInfoID, markup.ID); |
|
| 316 |
control.Visibility = Visibility.Hidden; |
|
| 317 | 310 |
} |
| 318 | 311 |
else |
| 319 | 312 |
{
|
| ... | ... | |
| 329 | 322 |
//Group_ID = p.Group_ID |
| 330 | 323 |
}; |
| 331 | 324 |
ViewerDataModel.Instance.MarkupList_Pre.Add(markup); |
| 332 |
|
|
| 333 |
var control = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, d.DisplayColor, "", |
|
| 334 |
d.MarkupInfoID, markup.ID); |
|
| 335 |
control.Visibility = Visibility.Hidden; |
|
| 336 | 325 |
} |
| 337 | 326 |
})); |
| 338 | 327 |
|
| ... | ... | |
| 374 | 363 |
if (info.UserID == App.ViewInfo.UserID) info.DisplayColor = "#FFFF0000"; |
| 375 | 364 |
} |
| 376 | 365 |
|
| 366 |
ViewerDataModel.Instance.PageNumber = 1; |
|
| 367 |
|
|
| 377 | 368 |
/// Consolidation 된 데이터가 최상단에 올 수 있도록 변경 |
| 378 | 369 |
var markupItem = ViewerDataModel.Instance._markupInfoList.OrderByDescending(p => p.Consolidate == Convert.ToInt32(true)).ToList(); |
| 379 | 370 |
markupItem.ForEach(data => |
| ... | ... | |
| 489 | 480 |
{
|
| 490 | 481 |
foreach (var item in gridSelectionItem) |
| 491 | 482 |
{
|
| 492 |
if ((item.UserID == App.ViewInfo.UserID) && (this.pageNavigator.CurrentPage != null))
|
|
| 483 |
if (item.UserID == App.ViewInfo.UserID)
|
|
| 493 | 484 |
{
|
| 494 | 485 |
var controls = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(d => d.MarkupInfoID == item.MarkupInfoID).ToList(); |
| 495 | 486 |
if (controls.Count == 0) |
| 496 | 487 |
{
|
| 497 |
var instance = ViewerDataModel.Instance.MyMarkupList.Where(d => d.PageNumber == pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList();
|
|
| 488 |
var instance = ViewerDataModel.Instance.MyMarkupList.Where(d => d.PageNumber == ViewerDataModel.Instance.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList();
|
|
| 498 | 489 |
foreach (var markup in instance) |
| 499 | 490 |
{
|
| 500 | 491 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", |
| ... | ... | |
| 509 | 500 |
control.Visibility = Visibility.Visible; |
| 510 | 501 |
} |
| 511 | 502 |
} |
| 512 |
else if (this.pageNavigator.CurrentPage != null)
|
|
| 503 |
else |
|
| 513 | 504 |
{
|
| 514 | 505 |
var controls = Common.ViewerDataModel.Instance.MarkupControls.Where(d => d.MarkupInfoID == item.MarkupInfoID).ToList(); |
| 515 | 506 |
if (controls.Count == 0) |
| 516 | 507 |
{
|
| 517 |
var instance = ViewerDataModel.Instance.MarkupList_Pre.Where(d => d.PageNumber == pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList();
|
|
| 508 |
var instance = ViewerDataModel.Instance.MarkupList_Pre.Where(d => d.PageNumber == ViewerDataModel.Instance.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList();
|
|
| 518 | 509 |
foreach (var markup in instance) |
| 519 | 510 |
{
|
| 520 | 511 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", |
내보내기 Unified diff
