개정판 76688e76
issue #1136: Text Control 포커스 수정. final pdf 상태체크 시 오류난것은 제외.
Change-Id: Id7ac4d247208f496ef8ce5397f2bf27eeefac48e
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 2142 | 2142 |
{
|
| 2143 | 2143 |
(item as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 2144 | 2144 |
} |
| 2145 |
else if (item as TextControl != null) |
|
| 2146 |
{
|
|
| 2147 |
(item as TextControl).Base_TextBox.IsHitTestVisible = false; |
|
| 2148 |
} |
|
| 2145 | 2149 |
} |
| 2146 | 2150 |
|
| 2147 | 2151 |
//if (currentControl != null) |
| 2148 | 2152 |
{
|
| 2149 | 2153 |
var text_item_ = ViewerDataModel.Instance.MarkupControls_USER.Where(data => (data as TextControl) != null && (data as TextControl).Base_TextBox.Visibility == Visibility.Visible).FirstOrDefault(); |
| 2150 |
if (text_item_ != null) |
|
| 2154 |
if (text_item_ != null )
|
|
| 2151 | 2155 |
{
|
| 2152 | 2156 |
(text_item_ as TextControl).Base_TextBlock.Visibility = Visibility.Visible; |
| 2153 | 2157 |
(text_item_ as TextControl).Base_TextBox.Visibility = Visibility.Collapsed; |
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 2817 | 2817 |
{
|
| 2818 | 2818 |
using (KCOMEntities _entity = new KCOMEntities(ConnectStringBuilder.KCOMConnectionString().ToString())) |
| 2819 | 2819 |
{
|
| 2820 |
var finalpdf = _entity.FINAL_PDF.Where(x => x.DOCINFO_ID == DocInfoID && x.MARKUPINFO_ID == MarkupInfoID && x.CREATE_USER_ID == CreateUserID).FirstOrDefault(); |
|
| 2820 |
var finalpdf = _entity.FINAL_PDF.Where(x => x.DOCINFO_ID == DocInfoID && x.MARKUPINFO_ID == MarkupInfoID && x.CREATE_USER_ID == CreateUserID && x.STATUS != (int)FinalStatus.Error).FirstOrDefault();
|
|
| 2821 | 2821 |
if (finalpdf != null) |
| 2822 | 2822 |
{
|
| 2823 | 2823 |
if (finalpdf.STATUS == (int)FinalStatus.Success) |
내보내기 Unified diff
