개정판 0585d5cc
markus Api 오류 출력 되도록 수정
Change-Id: I7318ee5da1ec9b8dbfd4450a1ab7117b6b2713ea
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 224 | 224 |
|
| 225 | 225 |
private void BaseClient_GetDeptDataCompleted(object sender, GetDeptDataCompletedEventArgs e) |
| 226 | 226 |
{
|
| 227 |
Logger.sendResLog("GetDeptDataCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 227 |
if (e.Error == null) |
|
| 228 |
{
|
|
| 229 |
Logger.sendResLog("GetDeptDataCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 230 |
} |
|
| 231 |
else |
|
| 232 |
{
|
|
| 233 |
Logger.sendResLog("GetDeptDataCompleted", "\r Error :" + e.Error, 1);
|
|
| 234 |
} |
|
| 228 | 235 |
|
| 229 | 236 |
if (e.Result != null) |
| 230 | 237 |
{
|
| ... | ... | |
| 232 | 239 |
//cbSymbolPublic.ItemsSource = e.Result.ToList(); |
| 233 | 240 |
} |
| 234 | 241 |
} |
| 242 |
|
|
| 235 | 243 |
public MarkupInfoItem PreviewUserMarkupInfoItem { get; set; }
|
| 236 | 244 |
|
| 237 | 245 |
/// <summary> |
| ... | ... | |
| 263 | 271 |
{
|
| 264 | 272 |
docInfo = _DocInfo, |
| 265 | 273 |
Document_Id = _DocInfo.DOCUMENT_ID, |
| 266 |
Document_NO = _DocItem.DOCUMENT_NO, |
|
| 267 | 274 |
File_Original = _DocInfo.ORIGINAL_FILE, |
| 268 |
File_Result = _DocItem.RESULT_FILE, |
|
| 269 |
Group_No = _DocItem.GROUP_NO, |
|
| 270 |
ProjectNo = _DocItem.PROJECT_NO, |
|
| 271 |
Revision = _DocItem.REVISION, |
|
| 275 |
|
|
| 276 |
Document_NO = _DocItem?.DOCUMENT_NO, |
|
| 277 |
File_Result = _DocItem?.RESULT_FILE, |
|
| 278 |
Group_No = _DocItem?.GROUP_NO, |
|
| 279 |
ProjectNo = _DocItem?.PROJECT_NO, |
|
| 280 |
Revision = _DocItem?.REVISION, |
|
| 272 | 281 |
}; |
| 282 |
|
|
| 273 | 283 |
var instanceMain = this.ParentOfType<MainWindow>(); |
| 274 | 284 |
string firstpage = "1"; |
| 275 | 285 |
string lastpage = _DocInfo.PAGE_COUNT.ToString(); |
| 276 | 286 |
instanceMain.dzTopMenu.tlcurrentPage.Text = firstpage; |
| 277 | 287 |
instanceMain.dzTopMenu.tlcurrentPage_readonly.Text = lastpage; |
| 278 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem.DOCUMENT_NO, _DocItem.REVISION, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
|
| 288 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem?.DOCUMENT_NO, _DocItem?.REVISION, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
|
| 279 | 289 |
instanceMain.TitleText.Text = apptitle; |
| 280 | 290 |
instanceMain.Title = apptitle; |
| 281 | 291 |
|
| ... | ... | |
| 323 | 333 |
ViewerDataModel.Instance._markupInfoList.Clear(); |
| 324 | 334 |
if (e.Result.Count > 0) ViewerDataModel.Instance.MyMarkupList.Clear(); |
| 325 | 335 |
|
| 326 |
foreach(var info in e.Result) |
|
| 336 |
foreach (var info in e.Result)
|
|
| 327 | 337 |
{
|
| 328 | 338 |
if (info.UserID == App.ViewInfo.UserID) |
| 329 | 339 |
{
|
| ... | ... | |
| 337 | 347 |
ViewerDataModel.Instance._markupInfoList.Add(info); |
| 338 | 348 |
} |
| 339 | 349 |
|
| 340 |
var userInfoList = ViewerDataModel.Instance._markupInfoList.GroupBy(f => f.UserID).Select(f=>new MarkupUserInfo { UserId = f.Key, UserName = f.First().UserName });
|
|
| 350 |
var userInfoList = ViewerDataModel.Instance._markupInfoList.GroupBy(f => f.UserID).Select(f => new MarkupUserInfo { UserId = f.Key, UserName = f.First().UserName });
|
|
| 341 | 351 |
|
| 342 | 352 |
userInfoList.ToList().ForEach(x => ViewerDataModel.Instance._markupUserList.Add(x)); |
| 343 | 353 |
|
| 344 |
e.Result.ToList().ForEach(d => d.MarkupList.ForEach(p =>
|
|
| 354 |
e.Result.ToList().ForEach(d => |
|
| 345 | 355 |
{
|
| 346 |
if (d.UserID == App.ViewInfo.UserID) |
|
| 347 |
{
|
|
| 348 |
d.userDelete = true; |
|
| 349 |
d.DisplayColor = "#FFFF0000"; |
|
| 350 |
|
|
| 351 |
MarkupItemEx markup = new MarkupItemEx |
|
| 352 |
{
|
|
| 353 |
Data = p.Data, |
|
| 354 |
Data_Type = p.Data_Type, |
|
| 355 |
ID = p.ID, |
|
| 356 |
IsUpdate = false, |
|
| 357 |
MarkupInfoID = d.MarkupInfoID, |
|
| 358 |
PageNumber = p.PageNumber, |
|
| 359 |
Symbol_ID = p.Symbol_ID, |
|
| 360 |
//Group_ID = p.Group_ID |
|
| 361 |
}; |
|
| 362 |
ViewerDataModel.Instance.MyMarkupList.Add(markup); |
|
| 363 |
} |
|
| 364 |
else |
|
| 356 |
if (d.MarkupList != null) |
|
| 365 | 357 |
{
|
| 366 |
MarkupItemEx markup = new MarkupItemEx
|
|
| 358 |
d.MarkupList.ForEach(p =>
|
|
| 367 | 359 |
{
|
| 368 |
Data = p.Data, |
|
| 369 |
Data_Type = p.Data_Type, |
|
| 370 |
ID = p.ID, |
|
| 371 |
IsUpdate = false, |
|
| 372 |
MarkupInfoID = d.MarkupInfoID, |
|
| 373 |
PageNumber = p.PageNumber, |
|
| 374 |
Symbol_ID = p.Symbol_ID, |
|
| 375 |
//Group_ID = p.Group_ID |
|
| 376 |
}; |
|
| 377 |
ViewerDataModel.Instance.MarkupList_Pre.Add(markup); |
|
| 360 |
if (d.UserID == App.ViewInfo.UserID) |
|
| 361 |
{
|
|
| 362 |
d.userDelete = true; |
|
| 363 |
d.DisplayColor = "#FFFF0000"; |
|
| 364 |
|
|
| 365 |
MarkupItemEx markup = new MarkupItemEx |
|
| 366 |
{
|
|
| 367 |
Data = p.Data, |
|
| 368 |
Data_Type = p.Data_Type, |
|
| 369 |
ID = p.ID, |
|
| 370 |
IsUpdate = false, |
|
| 371 |
MarkupInfoID = d.MarkupInfoID, |
|
| 372 |
PageNumber = p.PageNumber, |
|
| 373 |
Symbol_ID = p.Symbol_ID, |
|
| 374 |
//Group_ID = p.Group_ID |
|
| 375 |
}; |
|
| 376 |
ViewerDataModel.Instance.MyMarkupList.Add(markup); |
|
| 377 |
} |
|
| 378 |
else |
|
| 379 |
{
|
|
| 380 |
MarkupItemEx markup = new MarkupItemEx |
|
| 381 |
{
|
|
| 382 |
Data = p.Data, |
|
| 383 |
Data_Type = p.Data_Type, |
|
| 384 |
ID = p.ID, |
|
| 385 |
IsUpdate = false, |
|
| 386 |
MarkupInfoID = d.MarkupInfoID, |
|
| 387 |
PageNumber = p.PageNumber, |
|
| 388 |
Symbol_ID = p.Symbol_ID, |
|
| 389 |
//Group_ID = p.Group_ID |
|
| 390 |
}; |
|
| 391 |
ViewerDataModel.Instance.MarkupList_Pre.Add(markup); |
|
| 392 |
} |
|
| 393 |
}); |
|
| 378 | 394 |
} |
| 379 |
}));
|
|
| 395 |
}); |
|
| 380 | 396 |
|
| 381 | 397 |
var currentUser = e.Result.Where(data => data.UserID == App.ViewInfo.UserID && data.AvoidConsolidate == 0).FirstOrDefault(); |
| 382 | 398 |
|
| ... | ... | |
| 652 | 668 |
} |
| 653 | 669 |
else |
| 654 | 670 |
{
|
| 671 |
DialogMessage_Alert("Document Information Not Found.", "Error");
|
|
| 672 |
|
|
| 655 | 673 |
BaseClient.GetCheckSystemAdminCompleted += (sen, ea) => |
| 656 | 674 |
{
|
| 657 | 675 |
Logger.sendResLog("GetCheckSystemAdminCompleted", "UserState : " + ea.UserState + "\r Result :" + ea.Result + "\r Cancelled :" + ea.Cancelled + "\r Error :" + ea.Error, 1);
|
내보내기 Unified diff
