개정판 e31e5b1b
Fix: Team Consolidate 할때 로그인 한 사용자와 같은 부서의 Comment만 취합하도록 수정
Change-Id: If2aee0eda8ef061959a24cf6ab01b9bb978fcff2
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 3129 | 3129 |
} |
| 3130 | 3130 |
else if (mouseHandlingMode == MouseHandlingMode.Drawing) |
| 3131 | 3131 |
{
|
| 3132 |
|
|
| 3133 |
|
|
| 3134 | 3132 |
init(); |
| 3135 | 3133 |
//강인구 추가(우 클릭 일 경우 커서 변경 하지 않음) |
| 3136 | 3134 |
if (cursor != Cursors.SizeAll) |
| ... | ... | |
| 3160 | 3158 |
} |
| 3161 | 3159 |
else |
| 3162 | 3160 |
{
|
| 3163 |
var item = gridViewMarkup.SelectedItems.Where(d => (d as MarkupInfoItem).UserID == App.ViewInfo.UserID).FirstOrDefault() as MarkupInfoItem;
|
|
| 3161 |
var item = gridViewMarkup.SelectedItems.FirstOrDefault(d => (d as MarkupInfoItem).UserID == App.ViewInfo.UserID) as MarkupInfoItem;
|
|
| 3164 | 3162 |
if (item != null) |
| 3165 | 3163 |
{
|
| 3166 | 3164 |
App.Custom_ViewInfoId = item.MarkupInfoID; |
| ... | ... | |
| 3472 | 3470 |
} |
| 3473 | 3471 |
} |
| 3474 | 3472 |
break; |
| 3475 |
|
|
| 3476 | 3473 |
case ControlType.CancelLine: |
| 3477 | 3474 |
case ControlType.SingleLine: |
| 3478 | 3475 |
case ControlType.ArrowLine: |
| ... | ... | |
| 3511 | 3508 |
} |
| 3512 | 3509 |
} |
| 3513 | 3510 |
break; |
| 3514 |
|
|
| 3515 | 3511 |
case ControlType.PolygonControl: |
| 3516 | 3512 |
{
|
| 3517 | 3513 |
if (currentControl is PolygonControl) |
| ... | ... | |
| 3571 | 3567 |
} |
| 3572 | 3568 |
} |
| 3573 | 3569 |
break; |
| 3574 |
|
|
| 3575 | 3570 |
case ControlType.ChainLine: |
| 3576 | 3571 |
{
|
| 3577 | 3572 |
if (currentControl is PolygonControl) |
| ... | ... | |
| 3631 | 3626 |
} |
| 3632 | 3627 |
} |
| 3633 | 3628 |
break; |
| 3634 |
|
|
| 3635 | 3629 |
case ControlType.ArcLine: |
| 3636 | 3630 |
{
|
| 3637 | 3631 |
if (e.LeftButton == MouseButtonState.Pressed) |
| ... | ... | |
| 3673 | 3667 |
} |
| 3674 | 3668 |
} |
| 3675 | 3669 |
break; |
| 3676 |
|
|
| 3677 | 3670 |
case ControlType.ArcArrow: |
| 3678 | 3671 |
{
|
| 3679 | 3672 |
if (e.LeftButton == MouseButtonState.Pressed) |
| ... | ... | |
| 3719 | 3712 |
} |
| 3720 | 3713 |
} |
| 3721 | 3714 |
break; |
| 3722 |
|
|
| 3723 | 3715 |
case ControlType.ArrowMultiLine: |
| 3724 | 3716 |
{
|
| 3725 | 3717 |
if (e.LeftButton == MouseButtonState.Pressed) |
| ... | ... | |
| 3771 | 3763 |
} |
| 3772 | 3764 |
} |
| 3773 | 3765 |
break; |
| 3774 |
|
|
| 3775 | 3766 |
case ControlType.PolygonCloud: |
| 3776 | 3767 |
{
|
| 3777 | 3768 |
if (currentControl is CloudControl) |
| ... | ... | |
| 3837 | 3828 |
{
|
| 3838 | 3829 |
if (e.LeftButton == MouseButtonState.Pressed) |
| 3839 | 3830 |
{
|
| 3840 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
|
| 3841 |
//{
|
|
| 3842 | 3831 |
if (currentControl is ImgControl) |
| 3843 | 3832 |
{
|
| 3844 | 3833 |
//20180906 LJY TEST IsRotationDrawingEnable |
| 3845 |
if (IsGetoutpoint((currentControl as ImgControl).PointSet.Where(data => IsRotationDrawingEnable(data) == true).FirstOrDefault()))
|
|
| 3834 |
if (IsGetoutpoint((currentControl as ImgControl).PointSet.Find(data => IsRotationDrawingEnable(data))))
|
|
| 3846 | 3835 |
{
|
| 3847 | 3836 |
return; |
| 3848 | 3837 |
} |
| ... | ... | |
| 3894 | 3883 |
(currentControl as ImgControl).CommentAngle -= rotate.Angle; |
| 3895 | 3884 |
} |
| 3896 | 3885 |
} |
| 3897 |
//} |
|
| 3898 | 3886 |
} |
| 3899 | 3887 |
} |
| 3900 | 3888 |
break; |
| ... | ... | |
| 4836 | 4824 |
/// <summary> |
| 4837 | 4825 |
/// execute TeamConsolidationCommand |
| 4838 | 4826 |
/// </summary> |
| 4839 |
public void TeamConsolidationMethod2() |
|
| 4840 |
{
|
|
| 4841 |
if (this.gridViewMarkup.SelectedItems.Count == 0) |
|
| 4842 |
{
|
|
| 4843 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Please select at least one user", "Alert");
|
|
| 4844 |
} |
|
| 4845 |
else |
|
| 4846 |
{
|
|
| 4847 |
|
|
| 4848 |
ViewerDataModel.Instance.IsConsolidate = true; |
|
| 4849 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 4850 |
// update mylist and gridview |
|
| 4851 |
|
|
| 4852 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu.ExecuteSaveCommandAsync(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 4853 |
//this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
|
| 4854 |
ViewerDataModel.Instance.IsConsolidate = false; |
|
| 4855 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.UpdateMyMarkupList(); |
|
| 4856 |
foreach (MarkupInfoItem item in this.gridViewMarkup.SelectedItems) |
|
| 4857 |
{
|
|
| 4858 |
if (!this.userData.DEPARTMENT.Equals(item.Depatment)) |
|
| 4859 |
{
|
|
| 4860 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Please select at your department", "Alert");
|
|
| 4861 |
return; |
|
| 4862 |
} |
|
| 4863 |
} |
|
| 4864 |
List<MarkupInfoItem> MarkupInfoList = new List<MarkupInfoItem>(); |
|
| 4865 |
foreach (MarkupInfoItem item in this.gridViewMarkup.SelectedItems) |
|
| 4866 |
{
|
|
| 4867 |
MarkupInfoList.Add(item); |
|
| 4868 |
} |
|
| 4869 |
|
|
| 4870 |
TeamConsolidateCommand.Instance.Execute(MarkupInfoList); |
|
| 4871 |
} |
|
| 4872 |
} |
|
| 4873 | 4827 |
public async void TeamConsolidationMethod() |
| 4874 | 4828 |
{
|
| 4875 |
bool result = false; |
|
| 4876 |
|
|
| 4877 | 4829 |
if (this.gridViewMarkup.SelectedItems.Count == 0) |
| 4878 | 4830 |
{
|
| 4879 | 4831 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Please select at least one user", "Alert");
|
| ... | ... | |
| 4889 | 4841 |
} |
| 4890 | 4842 |
|
| 4891 | 4843 |
var isSave = await this.ParentOfType<MainWindow>().dzTopMenu.SaveEventAsync(); |
| 4892 |
|
|
| 4893 | 4844 |
if (isSave) |
| 4894 | 4845 |
{
|
| 4895 | 4846 |
var token = ViewerDataModel.Instance.NewMarkupCancelToken(); |
| 4896 | 4847 |
|
| 4897 | 4848 |
await MarkupLoadAsync(pageNavigator.CurrentPage.PageNumber, ViewerDataModel.Instance.PageAngle, token); |
| 4898 |
|
|
| 4849 |
|
|
| 4850 |
#region 로그인 사용자가 같은 부서의 마크업을 취합하여 Team Consolidate을 수행한다. |
|
| 4899 | 4851 |
List<IKCOM.MarkupInfoItem> MySelectItem = new List<IKCOM.MarkupInfoItem>(); |
| 4900 | 4852 |
foreach (var item in this.gridViewMarkup.SelectedItems) |
| 4901 | 4853 |
{
|
| 4902 |
MySelectItem.Add(item as IKCOM.MarkupInfoItem); |
|
| 4854 |
if((item as IKCOM.MarkupInfoItem).Depatment.Equals(this.userData.DEPARTMENT)) |
|
| 4855 |
MySelectItem.Add(item as IKCOM.MarkupInfoItem); |
|
| 4903 | 4856 |
} |
| 4904 | 4857 |
|
| 4905 | 4858 |
TeamConsolidateCommand.Instance.Execute(MySelectItem); |
| 4906 |
result = true;
|
|
| 4859 |
#endregion
|
|
| 4907 | 4860 |
} |
| 4908 | 4861 |
} |
| 4909 | 4862 |
} |
| 4910 | 4863 |
|
| 4864 |
/// <summary> |
|
| 4865 |
/// Consolidate를 수행한다. |
|
| 4866 |
/// </summary> |
|
| 4867 |
/// <returns></returns> |
|
| 4911 | 4868 |
public async Task<bool> ConsolidationMethod() |
| 4912 | 4869 |
{
|
| 4913 | 4870 |
bool result = false; |
| ... | ... | |
| 4939 | 4896 |
return result; |
| 4940 | 4897 |
} |
| 4941 | 4898 |
|
| 4899 |
/// <summary> |
|
| 4900 |
/// 조건에 맞게 Consolidate 버튼을 비활성화 시킨다. |
|
| 4901 |
/// </summary> |
|
| 4902 |
/// <param name="sender"></param> |
|
| 4903 |
/// <param name="e"></param> |
|
| 4942 | 4904 |
private void btnConsolidate_Loaded(object sender, RoutedEventArgs e) |
| 4943 | 4905 |
{
|
| 4944 | 4906 |
if (App.ViewInfo != null) |
| ... | ... | |
| 4956 | 4918 |
TeamConsolidationMethod(); |
| 4957 | 4919 |
} |
| 4958 | 4920 |
|
| 4921 |
/// <summary> |
|
| 4922 |
/// 조건에 따라 Team Consoidate 버튼을 비활성화 시킨다. |
|
| 4923 |
/// </summary> |
|
| 4924 |
/// <param name="sender"></param> |
|
| 4925 |
/// <param name="e"></param> |
|
| 4959 | 4926 |
private void btnTeamConsolidate_Loaded(object sender, RoutedEventArgs e) |
| 4960 | 4927 |
{
|
| 4961 | 4928 |
btnTeamConsolidate = sender as RadRibbonButton; |
내보내기 Unified diff
