개정판 664ea2e1
Markus에서 markusupdate를 변경하도록 수정
Change-Id: I4c2fe33f46732a9dc6b1fe683771c5acbcfd5d36
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 332 | 332 |
}; |
| 333 | 333 |
|
| 334 | 334 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolCompleted += BaseClient_SaveSymbolCompleted; |
| 335 |
Logger.sendReqLog("SaveSymbolAsync: ", symbol_private.ID + "," + symbol_private.MEMBER_USER_ID + "," + symbol_private.NAME + "," + symbol_private.IMAGE_URL + "," + symbol_private.DATA, 1);
|
|
| 335 |
//Logger.sendReqLog("SaveSymbolAsync: ", symbol_private.ID + "," + symbol_private.MEMBER_USER_ID + "," + symbol_private.NAME + "," + symbol_private.IMAGE_URL + "," + symbol_private.DATA, 1);
|
|
| 336 | 336 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolAsync(symbol_private); |
| 337 | 337 |
} |
| 338 | 338 |
catch (Exception) |
| ... | ... | |
| 354 | 354 |
DATA = Data |
| 355 | 355 |
}; |
| 356 | 356 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbolCompleted += BaseClient_AddPublicSymbolCompleted; |
| 357 |
Logger.sendReqLog("AddPublicSymbol: ", symbol_public.ID + "," + symbol_public.DEPARTMENT + "," + symbol_public.NAME + "," + symbol_public.IMAGE_URL + "," + symbol_public.DATA, 1);
|
|
| 357 |
//Logger.sendReqLog("AddPublicSymbol: ", symbol_public.ID + "," + symbol_public.DEPARTMENT + "," + symbol_public.NAME + "," + symbol_public.IMAGE_URL + "," + symbol_public.DATA, 1);
|
|
| 358 | 358 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbol(symbol_public); |
| 359 | 359 |
} |
| 360 | 360 |
catch (Exception) |
| ... | ... | |
| 365 | 365 |
|
| 366 | 366 |
private async void BaseClient_AddPublicSymbolCompleted(object sender, ServiceDeepView.AddPublicSymbolCompletedEventArgs e) |
| 367 | 367 |
{
|
| 368 |
Logger.sendResLog("AddPublicSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 368 |
//Logger.sendResLog("AddPublicSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 369 | 369 |
await DataBindAsync(); |
| 370 | 370 |
} |
| 371 | 371 |
|
| 372 | 372 |
private async void BaseClient_SaveSymbolCompleted(object sender, ServiceDeepView.SaveSymbolCompletedEventArgs e) |
| 373 | 373 |
{
|
| 374 |
Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 374 |
//Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 375 | 375 |
await DataBindAsync(); |
| 376 | 376 |
} |
| 377 | 377 |
|
| ... | ... | |
| 386 | 386 |
string delItem_ID = (lstSymbolPrivate.SelectedItem as Symbol_Custom).ID; |
| 387 | 387 |
|
| 388 | 388 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.DeleteSymbolCompleted += BaseClient_DeleteSymbolCompleted; |
| 389 |
Logger.sendReqLog("DeleteSymbolAsync: ", delItem_ID, 1);
|
|
| 389 |
//Logger.sendReqLog("DeleteSymbolAsync: ", delItem_ID, 1);
|
|
| 390 | 390 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.DeleteSymbolAsync(delItem_ID, RadTab.SelectedIndex); |
| 391 | 391 |
} |
| 392 | 392 |
#endregion |
| ... | ... | |
| 401 | 401 |
string delItem_ID = (lstSymbolPublic.SelectedItem as Symbol_Custom).ID; |
| 402 | 402 |
|
| 403 | 403 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.DeleteSymbolCompleted += BaseClient_DeleteSymbolCompleted; |
| 404 |
Logger.sendReqLog("DeleteSymbolAsync: ", delItem_ID, 1);
|
|
| 404 |
//Logger.sendReqLog("DeleteSymbolAsync: ", delItem_ID, 1);
|
|
| 405 | 405 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.DeleteSymbolAsync(delItem_ID, RadTab.SelectedIndex); |
| 406 | 406 |
} |
| 407 | 407 |
|
| 408 | 408 |
private async void BaseClient_DeleteSymbolCompleted(object sender, ServiceDeepView.DeleteSymbolCompletedEventArgs e) |
| 409 | 409 |
{
|
| 410 |
Logger.sendResLog("DeleteSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 410 |
//Logger.sendResLog("DeleteSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 411 | 411 |
await DataBindAsync(); |
| 412 | 412 |
} |
| 413 | 413 |
#endregion |
| ... | ... | |
| 429 | 429 |
|
| 430 | 430 |
try |
| 431 | 431 |
{
|
| 432 |
Logger.sendReqLog("GetSymbolData: ", id + "," + RadTab.SelectedIndex, 1);
|
|
| 432 |
//Logger.sendReqLog("GetSymbolData: ", id + "," + RadTab.SelectedIndex, 1);
|
|
| 433 | 433 |
Data_ = mainMenu.BaseClient.GetSymbolData(id, RadTab.SelectedIndex); |
| 434 | 434 |
|
| 435 | 435 |
if (Data_ != null || Data_ != "") |
| 436 | 436 |
{
|
| 437 |
Logger.sendResLog("GetSymbolData", "TRUE", 1);
|
|
| 437 |
//Logger.sendResLog("GetSymbolData", "TRUE", 1);
|
|
| 438 | 438 |
} |
| 439 | 439 |
else |
| 440 | 440 |
{
|
| 441 |
Logger.sendResLog("GetSymbolData", "FALSE", 1);
|
|
| 441 |
//Logger.sendResLog("GetSymbolData", "FALSE", 1);
|
|
| 442 | 442 |
} |
| 443 | 443 |
|
| 444 | 444 |
//MARKUP_DATA_GROUP INSERT |
| ... | ... | |
| 448 | 448 |
// STATE = 0, |
| 449 | 449 |
//}; |
| 450 | 450 |
//long group_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMarkupDataGroup(mARKUP_DATA_GROUP, App.ViewInfo.ProjectNO); |
| 451 |
//Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
|
| 451 |
////Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
|
| 452 | 452 |
|
| 453 | 453 |
if (Data_.Contains("|DZ|"))
|
| 454 | 454 |
{
|
| ... | ... | |
| 548 | 548 |
|
| 549 | 549 |
try |
| 550 | 550 |
{
|
| 551 |
Logger.sendReqLog("GetSymbolImageURL: ", id + "," + RadTab.SelectedIndex, 1);
|
|
| 551 |
//Logger.sendReqLog("GetSymbolImageURL: ", id + "," + RadTab.SelectedIndex, 1);
|
|
| 552 | 552 |
Data_ = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolImageURL(id, RadTab.SelectedIndex); |
| 553 | 553 |
if (Data_ != null || Data_ != "") |
| 554 | 554 |
{
|
| 555 |
Logger.sendResLog("GetSymbolImageURL", "TRUE", 1);
|
|
| 555 |
//Logger.sendResLog("GetSymbolImageURL", "TRUE", 1);
|
|
| 556 | 556 |
} |
| 557 | 557 |
else |
| 558 | 558 |
{
|
| 559 |
Logger.sendResLog("GetSymbolImageURL", "FALSE", 1);
|
|
| 559 |
//Logger.sendResLog("GetSymbolImageURL", "FALSE", 1);
|
|
| 560 | 560 |
} |
| 561 | 561 |
|
| 562 | 562 |
//MARKUP_DATA_GROUP INSERT |
| ... | ... | |
| 566 | 566 |
// STATE = 0, |
| 567 | 567 |
//}; |
| 568 | 568 |
//long group_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMarkupDataGroup(mARKUP_DATA_GROUP, App.ViewInfo.ProjectNO); |
| 569 |
//Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
|
| 569 |
////Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
|
| 570 | 570 |
|
| 571 | 571 |
if (Data_ != null) |
| 572 | 572 |
{
|
| ... | ... | |
| 725 | 725 |
{
|
| 726 | 726 |
Type type = e.OriginalSource.GetType(); |
| 727 | 727 |
string id = string.Empty; |
| 728 |
Logger.sendResLog("Move_Symbol", type.Name, 0);
|
|
| 728 |
//Logger.sendResLog("Move_Symbol", type.Name, 0);
|
|
| 729 | 729 |
if (type.Name == "Image") |
| 730 | 730 |
{
|
| 731 | 731 |
id = ((e.OriginalSource as Image).DataContext as Symbol_Custom).ID; |
| ... | ... | |
| 748 | 748 |
} |
| 749 | 749 |
catch(Exception ex) |
| 750 | 750 |
{
|
| 751 |
Logger.sendResLog("Move_Symbol", ex.Message, 0);
|
|
| 751 |
//Logger.sendResLog("Move_Symbol", ex.Message, 0);
|
|
| 752 | 752 |
} |
| 753 | 753 |
} |
| 754 | 754 |
#endregion |
| ... | ... | |
| 812 | 812 |
string _id = (lstSymbolPrivate.SelectedItem as Symbol_Custom).ID; |
| 813 | 813 |
string _name = args.PromptResult; |
| 814 | 814 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolCompleted += BaseClient_RenameSymbolCompleted; |
| 815 |
Logger.sendReqLog("RenameSymbolAsync: ", _id + "," + _name, 1);
|
|
| 815 |
//Logger.sendReqLog("RenameSymbolAsync: ", _id + "," + _name, 1);
|
|
| 816 | 816 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolAsync(_id, _name, RadTab.SelectedIndex); |
| 817 | 817 |
} |
| 818 | 818 |
else |
| ... | ... | |
| 820 | 820 |
string _id = (lstSymbolPublic.SelectedItem as Symbol_Custom).ID; |
| 821 | 821 |
string _name = args.PromptResult; |
| 822 | 822 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolCompleted += BaseClient_RenameSymbolCompleted; |
| 823 |
Logger.sendReqLog("RenameSymbolAsync: ", _id + "," + _name, 1);
|
|
| 823 |
//Logger.sendReqLog("RenameSymbolAsync: ", _id + "," + _name, 1);
|
|
| 824 | 824 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolAsync(_id, _name, RadTab.SelectedIndex); |
| 825 | 825 |
} |
| 826 | 826 |
} |
| ... | ... | |
| 828 | 828 |
|
| 829 | 829 |
private async void BaseClient_RenameSymbolCompleted(object sender, ServiceDeepView.RenameSymbolCompletedEventArgs e) |
| 830 | 830 |
{
|
| 831 |
Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 831 |
//Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
|
| 832 | 832 |
await DataBindAsync(); |
| 833 | 833 |
} |
| 834 | 834 |
#endregion |
| ... | ... | |
| 975 | 975 |
} |
| 976 | 976 |
catch (Exception ex) |
| 977 | 977 |
{
|
| 978 |
Logger.sendResLog("SyncInit", ex.Message, 0);
|
|
| 978 |
//Logger.sendResLog("SyncInit", ex.Message, 0);
|
|
| 979 | 979 |
} |
| 980 | 980 |
} |
| 981 | 981 |
|
| ... | ... | |
| 1002 | 1002 |
{
|
| 1003 | 1003 |
Type type = e.OriginalSource.GetType(); |
| 1004 | 1004 |
string id = string.Empty; |
| 1005 |
Logger.sendResLog("Move_Symbol", type.Name, 0);
|
|
| 1005 |
//Logger.sendResLog("Move_Symbol", type.Name, 0);
|
|
| 1006 | 1006 |
if (type.Name == "Image") |
| 1007 | 1007 |
{
|
| 1008 | 1008 |
id = ((e.OriginalSource as Image).DataContext as Symbol_Custom).ID; |
| ... | ... | |
| 1023 | 1023 |
//string _id = (lstSymbolPrivate.SelectedItem as Symbol_Custom).ID; |
| 1024 | 1024 |
string _name = ((System.Windows.Controls.TextBox)sender).Text; |
| 1025 | 1025 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolCompleted += BaseClient_RenameSymbolCompleted; |
| 1026 |
Logger.sendReqLog("RenameSymbolAsync: ", id + "," + _name, 1);
|
|
| 1026 |
//Logger.sendReqLog("RenameSymbolAsync: ", id + "," + _name, 1);
|
|
| 1027 | 1027 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolAsync(id, _name, RadTab.SelectedIndex); |
| 1028 | 1028 |
} |
| 1029 | 1029 |
else |
| ... | ... | |
| 1031 | 1031 |
//string _id = (lstSymbolPublic.SelectedItem as Symbol_Custom).ID; |
| 1032 | 1032 |
string _name = ((System.Windows.Controls.TextBox)sender).Text; |
| 1033 | 1033 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolCompleted += BaseClient_RenameSymbolCompleted; |
| 1034 |
Logger.sendReqLog("RenameSymbolAsync: ", id + "," + _name, 1);
|
|
| 1034 |
//Logger.sendReqLog("RenameSymbolAsync: ", id + "," + _name, 1);
|
|
| 1035 | 1035 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.RenameSymbolAsync(id, _name, RadTab.SelectedIndex); |
| 1036 | 1036 |
} |
| 1037 | 1037 |
|
내보내기 Unified diff
