개정판 bae83c92
- convert에서 한글 파일명 오류 수정
- merged pdf 실행하도록 메시지창 출력
Change-Id: I882454f7cf0f521c621f33db8876b568db5a8342
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 4635 | 4635 |
} |
| 4636 | 4636 |
} |
| 4637 | 4637 |
|
| 4638 |
private void FinalPDFEvent(object sender, RoutedEventArgs e) |
|
| 4638 |
private async void FinalPDFEvent(object sender, RoutedEventArgs e)
|
|
| 4639 | 4639 |
{
|
| 4640 | 4640 |
SelectionSet.Instance.UnSelect(this.ParentOfType<MainWindow>().dzMainMenu); |
| 4641 | 4641 |
// update mylist and gridview |
| 4642 | 4642 |
this.UpdateMyMarkupList(); |
| 4643 | 4643 |
|
| 4644 |
this.ParentOfType<MainWindow>().dzTopMenu.ExecuteSaveCommand(this); |
|
| 4644 |
var result = await this.ParentOfType<MainWindow>().dzTopMenu.ExecuteSaveCommand(this);
|
|
| 4645 | 4645 |
|
| 4646 |
var item = gridViewMarkup.Items.Cast<MarkupInfoItem>().Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault(); |
|
| 4646 |
if(!result) |
|
| 4647 |
{
|
|
| 4647 | 4648 |
|
| 4648 |
if (item != null) |
|
| 4649 |
} |
|
| 4650 |
else |
|
| 4649 | 4651 |
{
|
| 4650 |
if (BaseClient.FinalPDF_GetFinalPDFStatus(_DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID)) |
|
| 4652 |
var item = gridViewMarkup.Items.Cast<MarkupInfoItem>().Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault(); |
|
| 4653 |
|
|
| 4654 |
if (item != null) |
|
| 4651 | 4655 |
{
|
| 4652 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4656 |
if (BaseClient.FinalPDF_GetFinalPDFStatus(_DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID)) |
|
| 4657 |
{
|
|
| 4658 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4659 |
|
|
| 4660 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID); |
|
| 4653 | 4661 |
|
| 4654 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item.MarkupInfoID, _ViewInfo.UserID); |
|
| 4662 |
ViewerDataModel.Instance.FinalPDFTime = DateTime.Now; |
|
| 4663 |
} |
|
| 4664 |
else |
|
| 4665 |
{
|
|
| 4666 |
DialogMessage_Alert("Merged PDF가 수행중입니다", "안내");
|
|
| 4667 |
} |
|
| 4655 | 4668 |
} |
| 4656 | 4669 |
else |
| 4657 | 4670 |
{
|
| 4658 |
DialogMessage_Alert("Merged PDF가 수행중입니다", "안내");
|
|
| 4671 |
//Consolidate 가 없는 경우 |
|
| 4672 |
DialogMessage_Alert("Consolidation 된 코멘트가 존재하지 않습니다", "안내");
|
|
| 4659 | 4673 |
} |
| 4660 | 4674 |
} |
| 4661 |
else |
|
| 4662 |
{
|
|
| 4663 |
//Consolidate 가 없는 경우 |
|
| 4664 |
DialogMessage_Alert("Consolidation 된 코멘트가 존재하지 않습니다", "안내");
|
|
| 4665 |
} |
|
| 4675 |
|
|
| 4666 | 4676 |
} |
| 4667 | 4677 |
|
| 4668 | 4678 |
private void btnFinalPDF_Loaded(object sender, RoutedEventArgs e) |
| ... | ... | |
| 4712 | 4722 |
var item2 = items.Where(d => d.Consolidate == 1 && d.AvoidConsolidate == 0).FirstOrDefault(); |
| 4713 | 4723 |
if (item2 != null) |
| 4714 | 4724 |
{
|
| 4715 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item2.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4725 |
if (BaseClient.FinalPDF_GetFinalPDFStatus(_DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID)) |
|
| 4726 |
{
|
|
| 4727 |
//Logger.sendReqLog("SetFinalPDFAsync", _ViewInfo.ProjectNO + "," + _DocInfo.ID + "," + item2.MarkupInfoID + "," + _ViewInfo.UserID, 1);
|
|
| 4716 | 4728 |
|
| 4717 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID); |
|
| 4718 |
BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
|
| 4729 |
BaseClient.SetFinalPDFAsync(_ViewInfo.ProjectNO, _DocInfo.ID, item2.MarkupInfoID, _ViewInfo.UserID); |
|
| 4730 |
BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, _DocInfo.ID); |
|
| 4731 |
|
|
| 4732 |
ViewerDataModel.Instance.FinalPDFTime = DateTime.Now; |
|
| 4733 |
} |
|
| 4734 |
else |
|
| 4735 |
{
|
|
| 4736 |
DialogMessage_Alert("Merged PDF가 수행중입니다. 잠시 후 수행가능합니다.", "안내");
|
|
| 4737 |
} |
|
| 4719 | 4738 |
} |
| 4720 | 4739 |
else |
| 4721 | 4740 |
{
|
내보내기 Unified diff
