개정판 cb806a91
AliveGrid count expander열림, dashboard 테두리
Change-Id: Id50a07c853f65d7037685ba4c220cdd739c10fca
| ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DashBoardViewModel.cs | ||
|---|---|---|
| 201 | 201 |
}); |
| 202 | 202 |
} |
| 203 | 203 |
|
| 204 |
//await Task.Delay(5000); |
|
| 205 | 204 |
await Task.Delay(10000); |
| 206 | 205 |
|
| 207 |
//System.Threading.Thread.Sleep(new TimeSpan(0,0,0,0,100)); |
|
| 208 |
|
|
| 209 | 206 |
dispatcherTimer.Start(); |
| 210 | 207 |
} |
| 211 | 208 |
|
| ... | ... | |
| 269 | 266 |
_status = (int)SelectedStatus.Value; |
| 270 | 267 |
} |
| 271 | 268 |
|
| 272 |
//DocumentID = unikey |
|
| 273 | 269 |
DateTime? Start_CreateTime = null; |
| 274 | 270 |
DateTime? Finish_CreateTime = null; |
| 275 | 271 |
if (SelectedCreateTimeBegin != DefaultCreateTime) |
| ... | ... | |
| 296 | 292 |
} |
| 297 | 293 |
else |
| 298 | 294 |
{
|
| 299 |
|
|
| 300 |
//세미 업데이트 |
|
| 301 | 295 |
foreach (var newitem in Listitems) |
| 302 | 296 |
{
|
| 303 | 297 |
collection.UpdateWhere(changeitem => |
| ... | ... | |
| 308 | 302 |
if (statusCodeTypeList.Count() == 1) |
| 309 | 303 |
{
|
| 310 | 304 |
|
| 311 |
//삭제 |
|
| 312 | 305 |
for (int i = collection.Count() - 1; i >= 0; --i) |
| 313 | 306 |
{
|
| 314 | 307 |
var item = collection[i]; |
| ... | ... | |
| 322 | 315 |
|
| 323 | 316 |
if (statusCodeTypeList.Count() == 1) |
| 324 | 317 |
{
|
| 325 |
//추가 convert 후 추가됨 |
|
| 326 | 318 |
foreach (var item in Listitems) |
| 327 | 319 |
{
|
| 328 | 320 |
if (collection.Count(x => x.Project_NO == item.Project_NO && x.Count == item.Count) == 0) |
| ... | ... | |
| 355 | 347 |
_status = (int)SelectedStatus.Value; |
| 356 | 348 |
} |
| 357 | 349 |
|
| 358 |
//DocumentID = unikey |
|
| 359 | 350 |
DateTime? Start_CreateTime = null; |
| 360 | 351 |
DateTime? Finish_CreateTime = null; |
| 361 | 352 |
if (SelectedCreateTimeBegin != DefaultCreateTime) |
| ... | ... | |
| 382 | 373 |
} |
| 383 | 374 |
else |
| 384 | 375 |
{
|
| 385 |
|
|
| 386 |
//세미 업데이트 |
|
| 387 | 376 |
foreach (var newitem in Listitems) |
| 388 | 377 |
{
|
| 389 | 378 |
collection.UpdateWhere(changeitem => |
| ... | ... | |
| 393 | 382 |
|
| 394 | 383 |
if (statusCodeTypeList.Count() == 1) |
| 395 | 384 |
{
|
| 396 |
|
|
| 397 |
//삭제 |
|
| 398 | 385 |
for (int i = collection.Count() - 1; i >= 0; --i) |
| 399 | 386 |
{
|
| 400 | 387 |
var item = collection[i]; |
| ... | ... | |
| 408 | 395 |
|
| 409 | 396 |
if (statusCodeTypeList.Count() == 1) |
| 410 | 397 |
{
|
| 411 |
//추가 convert 후 추가됨 |
|
| 412 | 398 |
foreach (var item in Listitems) |
| 413 | 399 |
{
|
| 414 | 400 |
if (collection.Count(x => x.Project_NO == item.Project_NO && x.Count == item.Count) == 0) |
내보내기 Unified diff
