개정판 95e7bd84
수정사항 & Add Dialog validation 하는 중
Change-Id: Id53bbd718ea1cc5aebfc97f0216fe6a3f464ee00
| ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
|---|---|---|
| 519 | 519 |
} |
| 520 | 520 |
} |
| 521 | 521 |
|
| 522 |
static DateTime DefaultCreateTime = DateTime.Now; |
|
| 522 |
static DateTime DefaultCreateTime = DateTime.Now.AddHours(-1);
|
|
| 523 | 523 |
private DateTime _SelectedCreateTimeBegin = DefaultCreateTime; |
| 524 | 524 |
public DateTime SelectedCreateTimeBegin |
| 525 | 525 |
{
|
| ... | ... | |
| 1390 | 1390 |
|
| 1391 | 1391 |
public void RemoveCreateTimeFilter(object obj) |
| 1392 | 1392 |
{
|
| 1393 |
DefaultCreateTime = DateTime.Now; |
|
| 1393 |
DefaultCreateTime = DateTime.Now.AddHours(-1);
|
|
| 1394 | 1394 |
SelectedCreateTimeBegin = DefaultCreateTime; |
| 1395 | 1395 |
SelectedCreateTimeEnd = DefaultCreateTime; |
| 1396 | 1396 |
} |
| ... | ... | |
| 1418 | 1418 |
RevisionFilter = null; |
| 1419 | 1419 |
GroupNOFilter = null; |
| 1420 | 1420 |
DOCUMENT_URLFilter = null; |
| 1421 |
DefaultCreateTime = DateTime.Now; |
|
| 1421 |
DefaultCreateTime = DateTime.Now.AddHours(-1);
|
|
| 1422 | 1422 |
SelectedCreateTimeBegin = DefaultCreateTime; |
| 1423 | 1423 |
SelectedCreateTimeEnd = DefaultCreateTime; |
| 1424 | 1424 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
| ... | ... | |
| 1436 | 1436 |
|
| 1437 | 1437 |
public void ConvertAdd(object obj) |
| 1438 | 1438 |
{
|
| 1439 |
if (SearchTimerOn == true) |
|
| 1440 |
{
|
|
| 1441 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
|
| 1442 |
} |
|
| 1443 |
else |
|
| 1439 |
try |
|
| 1444 | 1440 |
{
|
| 1445 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
| 1446 |
} |
|
| 1441 |
if (SearchTimerOn == true) |
|
| 1442 |
{
|
|
| 1443 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
|
| 1444 |
} |
|
| 1445 |
else |
|
| 1446 |
{
|
|
| 1447 |
dispatcherTimer.Tick -= new EventHandler(Timer_Tick); |
|
| 1448 |
} |
|
| 1447 | 1449 |
|
| 1448 |
Views.ConvertAddDialog convertAddDialog = new Views.ConvertAddDialog(); |
|
| 1450 |
Views.ConvertAddDialog convertAddDialog = new Views.ConvertAddDialog();
|
|
| 1449 | 1451 |
|
| 1450 |
convertAddDialog.Owner = Application.Current.MainWindow; |
|
| 1451 |
convertAddDialog.WindowStartupLocation = WindowStartupLocation.CenterOwner; |
|
| 1452 |
convertAddDialog.Owner = Application.Current.MainWindow;
|
|
| 1453 |
convertAddDialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
|
|
| 1452 | 1454 |
|
| 1453 |
convertAddDialog.ShowDialog(); |
|
| 1455 |
convertAddDialog.ShowDialog();
|
|
| 1454 | 1456 |
|
| 1455 |
if (SearchTimerOn == true) |
|
| 1456 |
{
|
|
| 1457 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
|
| 1457 |
if (SearchTimerOn == true) |
|
| 1458 |
{
|
|
| 1459 |
dispatcherTimer.Tick += new EventHandler(SearchTimer_Tick); |
|
| 1460 |
} |
|
| 1461 |
else |
|
| 1462 |
{
|
|
| 1463 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
|
| 1464 |
} |
|
| 1458 | 1465 |
} |
| 1459 |
else
|
|
| 1466 |
catch(Exception ex)
|
|
| 1460 | 1467 |
{
|
| 1461 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick);
|
|
| 1468 |
MessageBox.Show(ex.ToString());
|
|
| 1462 | 1469 |
} |
| 1463 | 1470 |
} |
| 1464 | 1471 |
|
내보내기 Unified diff
