개정판 bb3a236d
issue #1029: Symbol List에 Department 중복되서 표시됨
Change-Id: If10ae3423a3ed44349f35634f25419682eb83811
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 325 | 325 |
}); |
| 326 | 326 |
|
| 327 | 327 |
gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList; |
| 328 |
|
|
| 328 | 329 |
if (PreviewUserMarkupInfoItem == null && gridViewMarkup.SelectedItems.Where(d => (d as MarkupInfoItem).UserID == App.ViewInfo.UserID).FirstOrDefault() == null) |
| 329 | 330 |
{
|
| 330 | 331 |
if (gridViewMarkup.Items.Cast<MarkupInfoItem>().ToList().Where(d => d.UserID == App.ViewInfo.UserID).Count() == 0) |
| ... | ... | |
| 6038 | 6039 |
{
|
| 6039 | 6040 |
Symbol_Custom Custom = new Symbol_Custom(); |
| 6040 | 6041 |
List<Symbol_Custom> Custom_List = new List<Symbol_Custom>(); |
| 6041 |
ServiceDeepView.ServiceDeepViewClient client = new ServiceDeepView.ServiceDeepViewClient(App._binding, App._EndPoint); |
|
| 6042 |
var symbol_Private = client.GetSymbolList(App.ViewInfo.UserID);
|
|
| 6042 |
//ServiceDeepView.ServiceDeepViewClient client = new ServiceDeepView.ServiceDeepViewClient(App._binding, App._EndPoint);
|
|
| 6043 |
var symbol_Private = BaseClient.GetSymbolList(App.ViewInfo.UserID);
|
|
| 6043 | 6044 |
foreach (var item in symbol_Private) |
| 6044 | 6045 |
{
|
| 6045 | 6046 |
Custom.Name = item.NAME; |
| ... | ... | |
| 6053 | 6054 |
Custom = new Symbol_Custom(); |
| 6054 | 6055 |
Custom_List = new List<Symbol_Custom>(); |
| 6055 | 6056 |
|
| 6056 |
symbolPanel_Instance.deptlist.ItemsSource = client.GetPublicSymbolDeptList();
|
|
| 6057 |
symbolPanel_Instance.deptlist.ItemsSource = BaseClient.GetPublicSymbolDeptList();
|
|
| 6057 | 6058 |
|
| 6058 | 6059 |
List<SYMBOL_PUBLIC> symbol_Public; |
| 6059 | 6060 |
|
| 6060 |
|
|
| 6061 | 6061 |
if (symbolPanel_Instance.deptlist.SelectedValue != null) |
| 6062 | 6062 |
{
|
| 6063 |
symbol_Public = client.GetPublicSymbolList(symbolPanel_Instance.deptlist.SelectedValue.ToString());
|
|
| 6063 |
symbol_Public = BaseClient.GetPublicSymbolList(symbolPanel_Instance.deptlist.SelectedValue.ToString());
|
|
| 6064 | 6064 |
} |
| 6065 | 6065 |
else |
| 6066 | 6066 |
{
|
| 6067 |
symbol_Public = client.GetPublicSymbolList(null);
|
|
| 6067 |
symbol_Public = BaseClient.GetPublicSymbolList(null);
|
|
| 6068 | 6068 |
} |
| 6069 | 6069 |
foreach (var item in symbol_Public) |
| 6070 | 6070 |
{
|
| ... | ... | |
| 6075 | 6075 |
Custom = new Symbol_Custom(); |
| 6076 | 6076 |
} |
| 6077 | 6077 |
symbolPanel_Instance.lstSymbolPublic.ItemsSource = Custom_List; |
| 6078 |
client.Close();
|
|
| 6078 |
BaseClient.Close();
|
|
| 6079 | 6079 |
} |
| 6080 | 6080 |
catch(Exception e) |
| 6081 | 6081 |
{
|
내보내기 Unified diff
