개정판 b9df9ab0
PEMSS의 코멘트 선택시 페이지 이동 수정
Change-Id: I9fbbb53456d5900103a5240262143a498500e27f
| KCOM/App.xaml.cs | ||
|---|---|---|
| 257 | 257 |
_EndPoint = new EndpointAddress(string.Format("{0}/ServiceDeepView.svc", sBaseServiceURL));
|
| 258 | 258 |
|
| 259 | 259 |
#if DEBUG |
| 260 |
_PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", "http://localhost:13009"));
|
|
| 260 |
_PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", sBaseServiceURL));
|
|
| 261 | 261 |
#else |
| 262 | 262 |
_PemssEndPoint = new EndpointAddress(string.Format("{0}/PemssService.svc", sBaseServiceURL));
|
| 263 | 263 |
#endif |
| KCOM/Common/ViewerDataModel.cs | ||
|---|---|---|
| 1131 | 1131 |
|
| 1132 | 1132 |
return new System.IO.MemoryStream(imageData); |
| 1133 | 1133 |
} |
| 1134 |
|
|
| 1135 |
public void GoToPage(int PageNumber) |
|
| 1136 |
{
|
|
| 1137 |
SystemMain.dzMainMenu.pageNavigator.GotoPage(PageNumber); |
|
| 1138 |
|
|
| 1139 |
SystemMain.dzMainMenu.pageNavigator.PageChanged += (snd, evt) => |
|
| 1140 |
{
|
|
| 1141 |
|
|
| 1142 |
}; |
|
| 1143 |
} |
|
| 1134 | 1144 |
|
| 1135 | 1145 |
public ViewerDataModel() |
| 1136 | 1146 |
{
|
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 13 | 13 |
<VerifyUploadedFiles>false</VerifyUploadedFiles> |
| 14 | 14 |
</PropertyGroup> |
| 15 | 15 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6MTY1LCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjExMTExMSIsIlVzZXJJRCI6ImFkbWluIiwiTW9kZSI6MCwicElkIjoiUDAwMDAwMDAwMDE4IiwidUlkIjoiVTAwMDAwMDAwMDAzIn0=/</StartArguments>
|
|
| 16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6MTgyLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjExMTExMSIsIlVzZXJJRCI6ImFkbWluIiwiTW9kZSI6MCwicElkIjoiUDAwMDAwMDAwMDE4IiwidUlkIjoiVTAwMDAwMDAwMDA1In0=/</StartArguments>
|
|
| 17 | 17 |
</PropertyGroup> |
| 18 | 18 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
| 19 | 19 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6MTYwLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjExMTExMSIsIlVzZXJJRCI6ImFkbWluIiwiTW9kZSI6MCwicElkIjoiUDAwMDAwMDAwMDE4IiwidUlkIjoiVTAwMDAwMDAwMDA1In0=/</StartArguments> |
| KCOM/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
| 52 | 52 |
// 지정되도록 할 수 있습니다. |
| 53 | 53 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 54 |
[assembly: AssemblyVersion("2.2.0.100")]
|
|
| 55 |
[assembly: AssemblyFileVersion("2.2.0.100")]
|
|
| 54 |
[assembly: AssemblyVersion("2.2.1.100")]
|
|
| 55 |
[assembly: AssemblyFileVersion("2.2.1.100")]
|
|
| KCOM/ViewModel/RequirementViewModel.cs | ||
|---|---|---|
| 294 | 294 |
|
| 295 | 295 |
private void GotoMarkup(IEnumerable<string> CommentIdList) |
| 296 | 296 |
{
|
| 297 |
var selectComments = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(x=> CommentIdList.Count(y=> y == x.CommentID) > 0).ToList(); |
|
| 297 |
// Common.ViewerDataModel.Instance.SystemMain.dzMainMenu |
|
| 298 |
///Common.ViewerDataModel.Instance._markupInfoList |
|
| 299 |
//var gridMarkup = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.gridViewMarkup; |
|
| 298 | 300 |
|
| 299 |
if (selectComments.Count() > 0) |
|
| 301 |
//var markuplist = (gridMarkup.ItemsSource as IEnumerable<IKCOM.MarkupInfoItem>).SelectMany(x => x.MarkupList); |
|
| 302 |
|
|
| 303 |
var infoList = Common.ViewerDataModel.Instance._markupInfoList.Where(x=>x.MarkupList != null).SelectMany(x => x.MarkupList).Where(f => f.ID == CommentIdList.First()); |
|
| 304 |
|
|
| 305 |
if (infoList.Count() > 0) |
|
| 306 |
{
|
|
| 307 |
var pageNavigator = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator; |
|
| 308 |
|
|
| 309 |
pageNavigator.GotoPage(infoList.First().PageNumber); |
|
| 310 |
|
|
| 311 |
pageNavigator.PageChanged += (snd, evt) => |
|
| 300 | 312 |
{
|
| 301 |
var infoList = Common.ViewerDataModel.Instance.MyMarkupList.Where(f => f.MarkupInfoID == selectComments.First().MarkupInfoID);
|
|
| 313 |
var selectComments = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(x => CommentIdList.Count(y => y == x.CommentID) > 0).ToList();
|
|
| 302 | 314 |
|
| 303 |
if (infoList.Count() > 0)
|
|
| 315 |
if (selectComments.Count() > 0)
|
|
| 304 | 316 |
{
|
| 305 |
Common.ViewerDataModel.Instance.PageBalanceNumber = infoList.First().PageNumber; |
|
| 306 |
selectComments.First().IsSelected = true; |
|
| 317 |
selectComments.ForEach(x => x.IsSelected = true); |
|
| 307 | 318 |
GotoMarkup(selectComments); |
| 308 |
|
|
| 309 |
selectComments.First().IsSelected =false; |
|
| 310 | 319 |
} |
| 311 |
} |
|
| 320 |
}; |
|
| 321 |
} |
|
| 312 | 322 |
} |
| 313 | 323 |
|
| 314 | 324 |
private void GotoMarkup(IEnumerable<MarkupToPDF.Common.CommentUserInfo> commentUserInfo) |
내보내기 Unified diff
