개정판 e1b36bc0
Feature: Grouping 기능 추가(Ctrl+G : Group, Ctrl+Shift+G : Ungroup)
Change-Id: I99a3309acd55799ff7101522feaa035225b80e48
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 36 | 36 |
public ViewInfo _ViewInfo; |
| 37 | 37 |
public DOCINFO _DocInfo; |
| 38 | 38 |
public DOCUMENT_ITEM _DocItem; |
| 39 |
public MEMBER userData; |
|
| 40 |
public List<int> MarkupSortList = new List<int>(); |
|
| 39 |
public MEMBER userData { get; set; }
|
|
| 41 | 40 |
|
| 42 | 41 |
public event PropertyChangedEventHandler PropertyChanged; |
| 43 | 42 |
private void NotifyPropertyChanged([CallerMemberName] String propertyName = "") |
| ... | ... | |
| 449 | 448 |
} |
| 450 | 449 |
else if (!App.ViewInfo.CreateFinalPDFPermission && App.ViewInfo.NewCommentPermission && e.Result.Where(x => x.UserID == App.ViewInfo.UserID && x.PartConsolidate == 1).Count() > 0)//Team Consolidation Mode이고 Team Consolidation Layer가 있을 경우 |
| 451 | 450 |
{
|
| 452 |
if (App.ViewInfo.NewCommentPermission && e.Result.Where(x => x.UserID == App.ViewInfo.UserID && x.PartConsolidate == 1 && x.MarkupInfoID == d.MarkupInfoID).Count() > 0)
|
|
| 451 |
if (App.ViewInfo.NewCommentPermission && e.Result.Exists(x => x.UserID == App.ViewInfo.UserID && x.PartConsolidate == 1 && x.MarkupInfoID == d.MarkupInfoID))
|
|
| 453 | 452 |
d.userDelete = true; |
| 454 | 453 |
} |
| 455 | 454 |
else if (App.ViewInfo.CreateFinalPDFPermission && App.ViewInfo.NewCommentPermission) //Consolidation Mode 일 때는 해당 Comment Layer의 Status가 Avoid or Consolidation인 것만 Delete 버튼 활성화 |
| ... | ... | |
| 1178 | 1177 |
{
|
| 1179 | 1178 |
if (e.Error == null && e.Result) |
| 1180 | 1179 |
{
|
| 1181 |
//Logger.sendReqLog("GetDocumentItemInfoAsync", _ViewInfo.ProjectNO + "," + _ViewInfo.DocumentItemID + "," + _ViewInfo.UserID, 1);
|
|
| 1182 |
|
|
| 1183 | 1180 |
BaseClient.GetDocumentItemInfoAsync(new KCOM_BasicParam { projectNo = _ViewInfo.ProjectNO, documentID = _ViewInfo.DocumentItemID, userID = _ViewInfo.UserID });
|
| 1184 | 1181 |
|
| 1185 | 1182 |
if (App.ViewInfo != null && App.ViewInfo.ProjectNO != "") |
| 1186 | 1183 |
{
|
| 1187 |
//Logger.sendReqLog("GetMember", _ViewInfo.ProjectNO + "," + _ViewInfo.UserID, 1);
|
|
| 1188 | 1184 |
userData = BaseClient.GetMember(App.ViewInfo.ProjectNO, App.ViewInfo.UserID); |
| 1189 | 1185 |
if (userData != null) |
| 1190 | 1186 |
{
|
| 1191 |
//Logger.sendReqLog("GetDeptDataAsync", userData.DEPARTMENT, 1);
|
|
| 1192 | 1187 |
BaseClient.GetDeptDataAsync(userData.DEPARTMENT); |
| 1193 | 1188 |
} |
| 1194 | 1189 |
else |
| 1195 | 1190 |
{
|
| 1196 | 1191 |
userData = new MEMBER(); |
| 1197 | 1192 |
userData.DEPARTMENT = "ALL"; |
| 1198 |
//Logger.sendReqLog("GetDeptDataAsync", userData.DEPARTMENT, 1);
|
|
| 1199 | 1193 |
BaseClient.GetDeptDataAsync(userData.DEPARTMENT); |
| 1200 | 1194 |
} |
| 1201 | 1195 |
} |
내보내기 Unified diff
