개정판 1305c420
license 추가
Change-Id: I8e7a4286cba7bd95a3475917a96e7b3560c67cb0
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2665 | 2665 |
DeleteCommand.Instance.Execute(new[] { text_item });
|
| 2666 | 2666 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(text_item); |
| 2667 | 2667 |
} |
| 2668 |
|
|
| 2668 | 2669 |
/// up to here |
| 2669 | 2670 |
|
| 2670 | 2671 |
foreach (var item in ViewerDataModel.Instance.MarkupControls_USER) |
| ... | ... | |
| 2773 | 2774 |
} |
| 2774 | 2775 |
} |
| 2775 | 2776 |
|
| 2777 |
bool isArrowTextEdit = false; |
|
| 2778 |
|
|
| 2779 |
if (currentControl is ArrowTextControl textControl) |
|
| 2780 |
{
|
|
| 2781 |
if (textControl.IsEditingMode) |
|
| 2782 |
isArrowTextEdit = true; |
|
| 2783 |
} |
|
| 2784 |
|
|
| 2776 | 2785 |
if (e.LeftButton == MouseButtonState.Pressed && mouseHandlingMode != MouseHandlingMode.Drawing && currentControl == null) |
| 2777 | 2786 |
{
|
| 2778 | 2787 |
if (mouseHandlingMode == MouseHandlingMode.Selecting) |
| ... | ... | |
| 2951 | 2960 |
} |
| 2952 | 2961 |
else if (mouseHandlingMode == MouseHandlingMode.Drawing) |
| 2953 | 2962 |
{
|
| 2963 |
|
|
| 2964 |
|
|
| 2954 | 2965 |
init(); |
| 2955 | 2966 |
//강인구 추가(우 클릭 일 경우 커서 변경 하지 않음) |
| 2956 | 2967 |
if (cursor != Cursors.SizeAll) |
| ... | ... | |
| 2986 | 2997 |
App.Custom_ViewInfoId = item.MarkupInfoID; |
| 2987 | 2998 |
} |
| 2988 | 2999 |
} |
| 2989 |
|
|
| 3000 |
|
|
| 2990 | 3001 |
switch (controlType) |
| 2991 | 3002 |
{
|
| 2992 | 3003 |
case ControlType.Coordinate: |
| ... | ... | |
| 3890 | 3901 |
} |
| 3891 | 3902 |
|
| 3892 | 3903 |
CreateCommand.Instance.Execute(currentControl); |
| 3904 |
|
|
| 3893 | 3905 |
try |
| 3894 | 3906 |
{
|
| 3895 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3907 |
if(!(currentControl as ArrowTextControl).IsEditingMode) |
|
| 3908 |
{
|
|
| 3909 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3910 |
} |
|
| 3896 | 3911 |
} |
| 3897 | 3912 |
catch (Exception ex) |
| 3898 | 3913 |
{
|
| ... | ... | |
| 3916 | 3931 |
currentControl.CommentID = Commons.shortGuid(); |
| 3917 | 3932 |
currentControl.IsNew = true; |
| 3918 | 3933 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3919 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3934 |
|
|
| 3935 |
try |
|
| 3936 |
{
|
|
| 3937 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3938 |
} |
|
| 3939 |
catch (Exception ex) |
|
| 3940 |
{
|
|
| 3941 |
System.Diagnostics.Debug.WriteLine(ex.ToString()); |
|
| 3942 |
} |
|
| 3920 | 3943 |
|
| 3921 | 3944 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
| 3922 | 3945 |
currentControl.SetValue(ArrowTextControl.StartPointProperty, CanvasDrawingMouseDownPoint); |
| ... | ... | |
| 4571 | 4594 |
} |
| 4572 | 4595 |
} |
| 4573 | 4596 |
|
| 4574 |
public async Task<bool> ConsolidationMethod()
|
|
| 4597 |
public bool ConsolidationMethod()
|
|
| 4575 | 4598 |
{
|
| 4576 | 4599 |
bool result = false; |
| 4577 | 4600 |
|
| ... | ... | |
| 4588 | 4611 |
} |
| 4589 | 4612 |
int iPageNo = Convert.ToInt32(this.ParentOfType<MainWindow>().dzTopMenu.tlcurrentPage.Text); |
| 4590 | 4613 |
|
| 4591 |
result = await ConsolidateCommand.Instance.Execute(MySelectItem, iPageNo);
|
|
| 4614 |
result = ConsolidateCommand.Instance.Execute(MySelectItem, iPageNo); |
|
| 4592 | 4615 |
} |
| 4593 | 4616 |
|
| 4594 | 4617 |
return result; |
| ... | ... | |
| 4715 | 4738 |
|
| 4716 | 4739 |
//var result = await this.ParentOfType<MainWindow>().dzTopMenu.ExecuteSaveCommand(this); |
| 4717 | 4740 |
|
| 4718 |
bool result = await ConsolidationMethod(); |
|
| 4741 |
Mouse.SetCursor(Cursors.Wait); |
|
| 4742 |
|
|
| 4743 |
bool result = ConsolidationMethod(); |
|
| 4719 | 4744 |
|
| 4720 |
var items = this.BaseClient.GetMarkupInfoItems(App.ViewInfo.ProjectNO, _DocInfo.ID);
|
|
| 4745 |
System.Threading.Thread.Sleep(600);
|
|
| 4721 | 4746 |
|
| 4722 |
var item2 = items.Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault(); |
|
| 4723 |
if (item2 != null) |
|
| 4747 |
if (result) |
|
| 4724 | 4748 |
{
|
| 4725 |
if (BaseClient.FinalPDF_GetFinalPDFStatus(_DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID)) |
|
| 4749 |
var items = this.BaseClient.GetMarkupInfoItems(App.ViewInfo.ProjectNO, _DocInfo.ID); |
|
| 4750 |
|
|
| 4751 |
var item2 = items.Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault(); |
|
| 4752 |
if (item2 != null) |
|
| 4726 | 4753 |
{
|
| 4727 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item2.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4754 |
if (BaseClient.FinalPDF_GetFinalPDFStatus(_DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID)) |
|
| 4755 |
{
|
|
| 4756 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item2.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4728 | 4757 |
|
| 4729 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID); |
|
| 4730 |
BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
|
| 4758 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID);
|
|
| 4759 |
BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID);
|
|
| 4731 | 4760 |
|
| 4732 |
ViewerDataModel.Instance.FinalPDFTime = DateTime.Now; |
|
| 4761 |
ViewerDataModel.Instance.FinalPDFTime = DateTime.Now; |
|
| 4762 |
|
|
| 4763 |
Mouse.SetCursor(Cursors.Arrow); |
|
| 4764 |
} |
|
| 4765 |
else |
|
| 4766 |
{
|
|
| 4767 |
DialogMessage_Alert("Merged PDF가 수행중입니다. 잠시 후 수행가능합니다.", "안내");
|
|
| 4768 |
} |
|
| 4733 | 4769 |
} |
| 4734 | 4770 |
else |
| 4735 | 4771 |
{
|
| 4736 |
DialogMessage_Alert("Merged PDF가 수행중입니다. 잠시 후 수행가능합니다.", "안내");
|
|
| 4772 |
DialogMessage_Alert("Consolidation 된 코멘트가 존재하지 않습니다", "안내");
|
|
| 4737 | 4773 |
} |
| 4738 | 4774 |
} |
| 4739 | 4775 |
else |
| 4740 | 4776 |
{
|
| 4741 |
DialogMessage_Alert("Consolidation 된 코멘트가 존재하지 않습니다", "안내");
|
|
| 4777 |
DialogMessage_Alert("서버가 원활하지 않습니다. 다시 수행 바랍니다.", "안내");
|
|
| 4742 | 4778 |
} |
| 4779 |
|
|
| 4780 |
Mouse.SetCursor(Cursors.Arrow); |
|
| 4743 | 4781 |
} |
| 4744 | 4782 |
} |
| 4745 | 4783 |
|
내보내기 Unified diff
