개정판 8ab0d0b1
issue #000
Consolidation의 _SaveEvent 이벤트에서 Message 을 안보이게 하기 위해 IsConsolidate True한 값을 False로 초기화 시켜주었다.
UserInfomation 쪽에 SelectionChanged 시 Consolidation 으로 선택을 누르면 Consolidation이 새로 생기는 오류 해결. 그리고 선택 동작 수정.
Change-Id: Id20a00c3cbf72c1161dd093df0dac7659444deac
| KCOM/Events/ConsolidateCommand.cs | ||
|---|---|---|
| 47 | 47 |
string sDocID = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocInfo.ID; |
| 48 | 48 |
/// 현재 작업 내용을 저장 |
| 49 | 49 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null); |
| 50 |
|
|
| 50 |
ViewerDataModel.Instance.IsConsolidate = false; |
|
| 51 |
|
|
| 51 | 52 |
Logger.sendReqLog("Consolidate", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID + "," + sDocID + "," + InfoList, 1);
|
| 52 | 53 |
Logger.sendResLog("Consolidate", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList).ToString(), 1);
|
| 53 | 54 |
|
| KCOM/Events/TeamConsolidateCommand.cs | ||
|---|---|---|
| 45 | 45 |
ViewerDataModel.Instance.IsConsolidate = true; |
| 46 | 46 |
/// save current working controls |
| 47 | 47 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu._SaveEvent(null, null); |
| 48 |
|
|
| 48 |
|
|
| 49 |
ViewerDataModel.Instance.IsConsolidate = false; |
|
| 49 | 50 |
string project_no = App.ViewInfo.ProjectNO; |
| 50 | 51 |
string doc_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocInfo.ID; |
| 51 | 52 |
string user_id = App.ViewInfo.UserID; |
| ... | ... | |
| 53 | 54 |
Logger.sendResLog("TeamConsolidate", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.TeamConsolidate(project_no, user_id, doc_id, MarkupInfoList).ToString(), 1);
|
| 54 | 55 |
|
| 55 | 56 |
Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + doc_id, 1);
|
| 57 |
|
|
| 56 | 58 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, doc_id); |
| 57 | 59 |
} |
| 58 | 60 |
catch(Exception ex) |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 455 | 455 |
if (e.AddedItems.Count() == 1) |
| 456 | 456 |
{
|
| 457 | 457 |
MarkupInfoItem instanceItem = e.AddedItems.FirstOrDefault() as MarkupInfoItem; |
| 458 |
var result = instanceItem.Consolidate;
|
|
| 458 |
gridViewMarkup.SelectedItem = null;
|
|
| 459 | 459 |
|
| 460 |
|
|
| 460 | 461 |
if (ea.DialogResult.Value) |
| 461 | 462 |
{
|
| 462 |
ConsolidationMethod(); |
|
| 463 |
if (instanceItem.Consolidate == 1 || instanceItem.PartConsolidate == 1) |
|
| 464 |
{
|
|
| 465 |
gridViewMarkup.SelectedItem = instanceItem; |
|
| 466 |
} |
|
| 467 |
else |
|
| 468 |
{
|
|
| 469 |
//1. Consolidations이 있다면 하나 선택 |
|
| 470 |
var Consolidations = resultA.Where(item => (item.Consolidate == 1 || item.PartConsolidate == 1)); |
|
| 471 |
|
|
| 472 |
if (Consolidations.Count() > 0) |
|
| 473 |
{
|
|
| 474 |
gridViewMarkup.SelectedItem = Consolidations.First(); |
|
| 475 |
} |
|
| 476 |
} |
|
| 477 |
|
|
| 463 | 478 |
} |
| 464 |
else |
|
| 465 |
{
|
|
| 466 |
((RadGridView)sender).SelectedItem = null; |
|
| 479 |
else {
|
|
| 480 |
//1. Consolidations 아닌게 있다면 Change |
|
| 481 |
var notConsolidations = resultA.Where(item => !(item.Consolidate == 1 || item.PartConsolidate == 1)); |
|
| 482 |
|
|
| 483 |
if(notConsolidations.Count() > 0) {
|
|
| 484 |
gridViewMarkup.SelectedItem = notConsolidations.First(); |
|
| 485 |
} |
|
| 486 |
else {//1. Consolidations 아닌게 없다면 그대로
|
|
| 487 |
gridViewMarkup.SelectedItem = instanceItem; |
|
| 488 |
} |
|
| 489 |
|
|
| 467 | 490 |
} |
| 468 | 491 |
} |
| 469 | 492 |
}), |
내보내기 Unified diff
