개정판 f65e6c02
debug_SNI 추가
Change-Id: I46d431ca15362882a9ab7e8dd7600371f47471de
KCOM/Controls/Sample.xaml.cs | ||
---|---|---|
26 | 26 |
public List<FAVORITE_DOC> _FavoriteSet { get; set; } |
27 | 27 |
public event PropertyChangedEventHandler PropertyChanged; |
28 | 28 |
public Sample() |
29 |
{ |
|
30 |
if(App.IsDesignMode) |
|
29 |
{ |
|
30 |
InitializeComponent(); |
|
31 |
|
|
32 |
if (App.IsDesignMode) |
|
31 | 33 |
{ |
32 | 34 |
return; |
33 | 35 |
} |
34 | 36 |
|
35 |
App.splashString(ISplashMessage.SAMPLE); |
|
37 |
//App.splashString(ISplashMessage.SAMPLE);
|
|
36 | 38 |
this.Loaded += Sample_Loaded; |
37 | 39 |
} |
38 | 40 |
|
... | ... | |
40 | 42 |
{ |
41 | 43 |
if(!_Initialize) |
42 | 44 |
{ |
43 |
InitializeComponent(); |
|
44 | 45 |
_Initialize = true; |
46 |
|
|
45 | 47 |
this.lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged); |
46 | 48 |
this.ImgListbox.SelectionChanged += new SelectionChangedEventHandler(ImgListbox_SelectionChanged); |
47 | 49 |
} |
... | ... | |
55 | 57 |
private bool _Initialize; |
56 | 58 |
public event EventHandler<PageChangeEventArgs> PageChanged; |
57 | 59 |
public event EventHandler<PageChangeEventArgs> PageChanging; |
58 |
List<UsersCommentPagesMember> _UsersCommentPagesList = new List<UsersCommentPagesMember>(); |
|
60 |
|
|
61 |
private List<UsersCommentPagesMember> _UsersCommentPagesList; |
|
62 |
|
|
63 |
public List<UsersCommentPagesMember> UsersCommentPagesList |
|
64 |
{ |
|
65 |
get { |
|
66 |
if(_UsersCommentPagesList == null) |
|
67 |
{ |
|
68 |
_UsersCommentPagesList = new List<UsersCommentPagesMember>(); |
|
69 |
} |
|
70 |
|
|
71 |
return _UsersCommentPagesList; } |
|
72 |
set { _UsersCommentPagesList = value; } |
|
73 |
} |
|
74 |
|
|
59 | 75 |
public class PageChangeEventArgs : EventArgs |
60 | 76 |
{ |
61 | 77 |
public DOCPAGE CurrentPage { get; set; } |
... | ... | |
404 | 420 |
public void SetCommentPages() |
405 | 421 |
{ |
406 | 422 |
ThumbnailSet(); |
407 |
SetCommentList(_UsersCommentPagesList.ToList());
|
|
423 |
SetCommentList(UsersCommentPagesList.ToList()); |
|
408 | 424 |
} |
409 | 425 |
|
410 | 426 |
public void SetCommentList(List<UsersCommentPagesMember> UsersCommentPagesList) |
... | ... | |
421 | 437 |
Logger.sendCheckLog("SetCommentList_delItem select 및 remove", 1); |
422 | 438 |
List<UsersCommentPagesMember> _delItem = new List<UsersCommentPagesMember>(); |
423 | 439 |
|
424 |
_UsersCommentPagesList.ToList().ForEach(item =>
|
|
440 |
this.UsersCommentPagesList.ToList().ForEach(item =>
|
|
425 | 441 |
{ |
426 | 442 |
var _comm = UsersCommentPagesList.Where(a => a.MarkupInfoID == item.MarkupInfoID); |
427 | 443 |
|
... | ... | |
431 | 447 |
} |
432 | 448 |
}); |
433 | 449 |
|
434 |
_delItem.ForEach(f => _UsersCommentPagesList.Remove(f));
|
|
450 |
_delItem.ForEach(f => this.UsersCommentPagesList.Remove(f));
|
|
435 | 451 |
|
436 | 452 |
Logger.sendCheckLog("SetCommentList_UsersCommentPagesMember_PropertyChanged", 1); |
437 | 453 |
List<SetColorMarkupItem> setColorMarkupItems = new List<SetColorMarkupItem>(); |
... | ... | |
441 | 457 |
user.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged); |
442 | 458 |
user.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged); |
443 | 459 |
|
444 |
var _commLst = _UsersCommentPagesList.Where(o => o.MarkupInfoID == user.MarkupInfoID);
|
|
460 |
var _commLst = this.UsersCommentPagesList.Where(o => o.MarkupInfoID == user.MarkupInfoID);
|
|
445 | 461 |
|
446 | 462 |
if (_commLst.Count() == 0) |
447 | 463 |
{ |
448 |
_UsersCommentPagesList.Add(user);
|
|
464 |
this.UsersCommentPagesList.Add(user);
|
|
449 | 465 |
} |
450 | 466 |
else |
451 | 467 |
{ |
... | ... | |
472 | 488 |
} |
473 | 489 |
|
474 | 490 |
Logger.sendCheckLog("SetCommentList_SelectComment.ItemsSource 설정", 1); |
475 |
var data = _UsersCommentPagesList.OrderByDescending(p => p.isConSolidation == Convert.ToInt32(true)).ToList();
|
|
491 |
var data = UsersCommentPagesList.OrderByDescending(p => p.isConSolidation == Convert.ToInt32(true)).ToList(); |
|
476 | 492 |
if (data.Count() != 0) |
477 | 493 |
{ |
478 | 494 |
if (Convert.ToBoolean(data.First().isConSolidation)) |
... | ... | |
483 | 499 |
} |
484 | 500 |
else |
485 | 501 |
{ |
486 |
this.lstSelectComment.ItemsSource = _UsersCommentPagesList; //섬네일
|
|
502 |
this.lstSelectComment.ItemsSource = this.UsersCommentPagesList; //섬네일
|
|
487 | 503 |
} |
488 | 504 |
} |
489 | 505 |
else |
490 | 506 |
{ |
491 |
this.lstSelectComment.ItemsSource = _UsersCommentPagesList; //섬네일
|
|
507 |
this.lstSelectComment.ItemsSource = this.UsersCommentPagesList; //섬네일
|
|
492 | 508 |
} |
493 |
|
|
509 |
|
|
494 | 510 |
Logger.sendCheckLog("SetComme6ntList_ImgListbox 설정", 1); |
495 | 511 |
|
496 | 512 |
|
... | ... | |
679 | 695 |
|
680 | 696 |
if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); } |
681 | 697 |
|
682 |
if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((MarkupUserInfo)commentUser.SelectedValue).UserName).ToList(); }
|
|
698 |
if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((KCOM.Common.UsersCommentPagesMember)commentUser.SelectedValue).UserName).ToList(); }
|
|
683 | 699 |
|
684 | 700 |
if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); } |
685 | 701 |
|
... | ... | |
1128 | 1144 |
List<MarkupInfoItemSmall> TempMarkupInfoSmallList = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList(); |
1129 | 1145 |
if (commentType.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(commentType.SelectedValue)).ToList(); } |
1130 | 1146 |
|
1131 |
if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((IKCOM.MarkupInfoItem)commentUser.SelectedValue).UserName).ToList(); }
|
|
1147 |
if (commentUser.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.UserName == ((KCOM.Common.UsersCommentPagesMember)commentUser.SelectedValue).UserName).ToList(); }
|
|
1132 | 1148 |
|
1133 | 1149 |
if (commentPage.SelectedValue != null) { TempMarkupInfoSmallList = TempMarkupInfoSmallList.Where(d => d.PageNumber == Convert.ToInt32(commentPage.SelectedValue)).ToList(); } |
1134 | 1150 |
|
내보내기 Unified diff