개정판 d2cd1e16
Title 에 Document 정보 추가
| KCOM/MainWindow.xaml | ||
|---|---|---|
| 30 | 30 |
<telerik:RadRibbonButton SmallImage="/KCOM;component/Resources/Images/MenuImage/undo.png" telerik:StyleManager.Theme="Office2016"/> |
| 31 | 31 |
<telerik:RadRibbonButton SmallImage="/KCOM;component/Resources/Images/MenuImage/redo.png" telerik:StyleManager.Theme="Office2016"/> |
| 32 | 32 |
</StackPanel> |
| 33 |
<TextBlock Text="MARKUS" Foreground="White" Margin="5,0" HorizontalAlignment="Center" VerticalAlignment="Center"/> |
|
| 33 |
<TextBlock Text="MARKUS" Foreground="White" Margin="5,0" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="TitleText"/>
|
|
| 34 | 34 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Stretch"> |
| 35 | 35 |
|
| 36 | 36 |
<!--강인구 수정--> |
| KCOM/MainWindow.xaml.cs | ||
|---|---|---|
| 240 | 240 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
| 241 | 241 |
{
|
| 242 | 242 |
DateTime undoTime = ViewerDataModel.Instance.UndoDataList.OrderByDescending(order => order.EventTime).FirstOrDefault().EventTime; |
| 243 |
DateTime updatetime = ViewerDataModel.Instance._markupInfoList.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
|
| 244 |
|
|
| 243 |
DateTime updatetime = DateTime.Now.AddDays(-1); |
|
| 244 |
if (ViewerDataModel.Instance._markupInfoList.Count > 0) |
|
| 245 |
{
|
|
| 246 |
updatetime = ViewerDataModel.Instance._markupInfoList.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
|
| 247 |
} |
|
| 245 | 248 |
if (undoTime > updatetime) |
| 246 | 249 |
{
|
| 247 | 250 |
var box = new TextBlock(); |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 826 | 826 |
if (e.Error != null) |
| 827 | 827 |
{
|
| 828 | 828 |
DialogMessage_Alert("페이지정보를 가져올 수 없습니다.", "Alert");
|
| 829 |
//MessageBox.Show("페이지정보를 가져올 수 없습니다.");
|
|
| 830 |
//this.ParentOfType<MainPage>().DialogMessage_Alert("Failed to get page information from Server", "Alert");
|
|
| 831 | 829 |
return; |
| 832 | 830 |
} |
| 833 | 831 |
|
| ... | ... | |
| 847 | 845 |
{
|
| 848 | 846 |
docInfo = _DocInfo, |
| 849 | 847 |
Document_Id = _DocInfo.DOCUMENT_ID, |
| 850 |
//Document_Name = docItem.DOCUMENT_NAME, |
|
| 851 | 848 |
Document_NO = _DocItem.DOCUMENT_NO, |
| 852 | 849 |
File_Original = _DocInfo.ORIGINAL_FILE, |
| 853 | 850 |
File_Result = _DocItem.RESULT_FILE, |
| ... | ... | |
| 858 | 855 |
var instanceMain = this.ParentOfType<MainWindow>(); |
| 859 | 856 |
instanceMain.dzTopMenu.tlcurrentPage.Text = _DocInfo.PAGE_COUNT.ToString(); |
| 860 | 857 |
instanceMain.dzTopMenu.tlcurrentPage_readonly.Text = _DocInfo.PAGE_COUNT.ToString(); |
| 861 |
|
|
| 858 |
string apptitle = string.Format("MARKUS - {0}(Rev.{1})", _DocItem.DOCUMENT_NO, _DocItem.REVISION);
|
|
| 859 |
instanceMain.TitleText.Text = apptitle; |
|
| 860 |
instanceMain.Title = apptitle; |
|
| 862 | 861 |
this.pageNavigator.SetPageNavi(CurrentDoc.docInfo.DOCPAGE.ToList(), MainUrl); |
| 863 | 862 |
|
| 864 | 863 |
ViewerDataModel.Instance.MarkupControls_USER.Clear(); |
내보내기 Unified diff
