프로젝트

일반

사용자정보

개정판 f5ec88b8

IDf5ec88b82c58a578a820e4ca1cc81226a767e634
상위 5307e38b
하위 c68259ac

semi 이(가) 4년 이상 전에 추가함

ConvertPDF 와 FinalPDF GridView 복구, Chart Gridview 제거, 프로세스 TEST 종료

Change-Id: Ibab88acb876c1c45a2edc802b7e08fe2b81b5b05

차이점 보기:

ConvertService/ServiceBase/Markus.ConvertProcessTest/App.config
1
<?xml version="1.0" encoding="utf-8" ?>
2
<configuration>
3
    <startup> 
4
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
5
    </startup>
6
</configuration>
ConvertService/ServiceBase/Markus.ConvertProcessTest/Markus.ConvertProcessTest.csproj
1
<?xml version="1.0" encoding="utf-8"?>
2
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4
  <PropertyGroup>
5
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7
    <ProjectGuid>{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}</ProjectGuid>
8
    <OutputType>Exe</OutputType>
9
    <RootNamespace>Markus.Service.ConvertProcess</RootNamespace>
10
    <AssemblyName>Markus.Service.ConvertProcess</AssemblyName>
11
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12
    <FileAlignment>512</FileAlignment>
13
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14
    <Deterministic>true</Deterministic>
15
  </PropertyGroup>
16
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17
    <PlatformTarget>AnyCPU</PlatformTarget>
18
    <DebugSymbols>true</DebugSymbols>
19
    <DebugType>full</DebugType>
20
    <Optimize>false</Optimize>
21
    <OutputPath>bin\Debug\</OutputPath>
22
    <DefineConstants>DEBUG;TRACE</DefineConstants>
23
    <ErrorReport>prompt</ErrorReport>
24
    <WarningLevel>4</WarningLevel>
25
  </PropertyGroup>
26
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27
    <PlatformTarget>AnyCPU</PlatformTarget>
28
    <DebugType>pdbonly</DebugType>
29
    <Optimize>true</Optimize>
30
    <OutputPath>bin\Release\</OutputPath>
31
    <DefineConstants>TRACE</DefineConstants>
32
    <ErrorReport>prompt</ErrorReport>
33
    <WarningLevel>4</WarningLevel>
34
  </PropertyGroup>
35
  <ItemGroup>
36
    <Reference Include="System" />
37
    <Reference Include="System.Core" />
38
    <Reference Include="System.Xml.Linq" />
39
    <Reference Include="System.Data.DataSetExtensions" />
40
    <Reference Include="Microsoft.CSharp" />
41
    <Reference Include="System.Data" />
42
    <Reference Include="System.Net.Http" />
43
    <Reference Include="System.Xml" />
44
  </ItemGroup>
45
  <ItemGroup>
46
    <Compile Include="Program.cs" />
47
    <Compile Include="Properties\AssemblyInfo.cs" />
48
  </ItemGroup>
49
  <ItemGroup>
50
    <None Include="App.config">
51
      <SubType>Designer</SubType>
52
    </None>
53
  </ItemGroup>
54
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
55
</Project>
ConvertService/ServiceBase/Markus.ConvertProcessTest/Program.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Text;
5
using System.Threading.Tasks;
6

  
7
namespace Markus.ConvertProcessTest
8
{
9
    class Program
10
    {
11
        static void Main(string[] args)
12
        {
13
            while (true)
14
            {
15
                System.Threading.Thread.Sleep(10000);
16
            }
17
        }
18
    }
19
}
ConvertService/ServiceBase/Markus.ConvertProcessTest/Properties/AssemblyInfo.cs
1
using System.Reflection;
2
using System.Runtime.CompilerServices;
3
using System.Runtime.InteropServices;
4

  
5
// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 
6
// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
7
// 이러한 특성 값을 변경하세요.
8
[assembly: AssemblyTitle("Markus.ConvertProcessTest")]
9
[assembly: AssemblyDescription("")]
10
[assembly: AssemblyConfiguration("")]
11
[assembly: AssemblyCompany("")]
12
[assembly: AssemblyProduct("Markus.ConvertProcessTest")]
13
[assembly: AssemblyCopyright("Copyright ©  2020")]
14
[assembly: AssemblyTrademark("")]
15
[assembly: AssemblyCulture("")]
16

  
17
// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 
18
// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면
19
// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요.
20
[assembly: ComVisible(false)]
21

  
22
// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다.
23
[assembly: Guid("9d5b0ca0-329d-40af-ba0d-b727080c19eb")]
24

  
25
// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다.
26
//
27
//      주 버전
28
//      부 버전 
29
//      빌드 번호
30
//      수정 버전
31
//
32
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
33
// 지정되도록 할 수 있습니다.
34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.0.0")]
36
[assembly: AssemblyFileVersion("1.0.0.0")]
ConvertService/ServiceBase/Markus.Service.StationController/AppDefine.cs
11 11

  
12 12
        public const string SERVICE = "SERVICE";
13 13
        public const string SERVICE_ADDRESS = "SERVICE_ADDRESS";
14

  
15
        public const string CONVERTPROCESS = "ConvertProcess";
16
        public const string PROCESS_NAME = "ProcessName";
14 17
        
18

  
15 19
        public const string MARKUS_CONNECTION_STRING = "MarkusDataBaseConnectionString";
16 20
    }
17 21
}
ConvertService/ServiceBase/Markus.Service.StationController/AppInit.cs
16 16
    {
17 17
        public static  List<StationServiceClient> StationClientList;
18 18
        public static string MarkusDataBaseConnecitonString;
19
        public static string ConvertProcessName;
19 20

  
20 21
        public App()
21 22
        {
......
52 53
                }
53 54

  
54 55
                MarkusDataBaseConnecitonString = AESEncrypter.Decrypt(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.MARKUS_CONNECTION_STRING));
56

  
57
                ConvertProcessName = config.GetValue(CONFIG_DEFINE.CONVERTPROCESS, CONFIG_DEFINE.PROCESS_NAME);
55 58
            }
56 59
            catch (Exception ex)
57 60
            {
ConvertService/ServiceBase/Markus.Service.StationController/Controls/RightAlignedLabelStrategy.cs
1
using GemBox.Spreadsheet.Charts;
2
using System;
3
using System.Collections.Generic;
4
using System.Linq;
5
using System.Text;
6
using System.Threading.Tasks;
7
using System.Windows;
8
using Telerik.Charting;
9
using Telerik.Windows.Controls;
10
using Telerik.Windows.Controls.ChartView;
11
using ChartSeries = Telerik.Windows.Controls.ChartView.ChartSeries;
12

  
13
namespace Markus.Service.StationController.Controls
14
{
15
        public class RightAlignedLabelStrategy : Telerik.Windows.Controls.ChartView.ChartSeriesLabelStrategy
16
        {
17
            public double Offset { get; set; }
18

  
19
            public override Telerik.Windows.Controls.ChartView.LabelStrategyOptions Options
20
            {
21
                get { return Telerik.Windows.Controls.ChartView.LabelStrategyOptions.Arrange; }
22
            }
23

  
24
            public override Telerik.Charting.RadRect GetLabelLayoutSlot(Telerik.Charting.DataPoint point, System.Windows.FrameworkElement visual, int labelIndex)
25
            {
26
                Size size = visual.DesiredSize;
27

  
28
                var series = (ChartSeries)point.Presenter;
29
                double top = point.LayoutSlot.Center.Y - (size.Height / 2);
30
                double left = series.Chart.PlotAreaClip.Right - size.Width + this.Offset;
31

  
32
                return new RadRect(left, top, size.Width, size.Height);
33
            }
34
        
35
    }
36
}
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj
193 193
    </Compile>
194 194
    <Compile Include="Controls\GridViewSelectionUtilities.cs" />
195 195
    <Compile Include="Controls\ITraceTextSink.cs" />
196
    <Compile Include="Controls\RightAlignedLabelStrategy.cs" />
197 196
    <Compile Include="Controls\RowIndexColumn.cs" />
198 197
    <Compile Include="Controls\TraceDocument.xaml.cs">
199 198
      <DependentUpon>TraceDocument.xaml</DependentUpon>
......
378 377
    <None Include="Resources\Tranfer_Error.ico" />
379 378
  </ItemGroup>
380 379
  <ItemGroup>
380
    <ProjectReference Include="..\Markus.ConvertProcessTest\Markus.ConvertProcessTest.csproj">
381
      <Project>{9d5b0ca0-329d-40af-ba0d-b727080c19eb}</Project>
382
      <Name>Markus.ConvertProcessTest</Name>
383
    </ProjectReference>
381 384
    <ProjectReference Include="..\Markus.Mvvm.ToolKit\Markus.Mvvm.ToolKit.csproj">
382 385
      <Project>{9efe95d6-9985-422a-a76f-285c8cf73617}</Project>
383 386
      <Name>Markus.Mvvm.ToolKit</Name>
ConvertService/ServiceBase/Markus.Service.StationController/StationController.ini
22 22

  
23 23
# remote test MARKUS_V3
24 24
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
25

  
26

  
27
[ConvertProcess]
28
ProcessName = "Markus.Service.ConvertProcess"
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
24 24
using Newtonsoft.Json;
25 25
using static Markus.Service.StationController.Data.ConvertPDF;
26 26
using System.Collections.ObjectModel;
27
using Markus.Service;
27 28

  
28 29
namespace Markus.Service.StationController.ViewModel
29 30
{
......
47 48
            ResetCommand = new DelegateCommand(Reset);
48 49
            ConvertAddCommand = new DelegateCommand(ConvertAdd);
49 50
            ConvertPathFileSearchCommand = new DelegateCommand(ConvertPathFileSearch);
51
            Stop_ProcessCommand = new DelegateCommand(Stop_Process);
50 52
        }
51 53

  
52 54
        #endregion
......
611 613
        public DelegateCommand ResetCommand { get; private set; }
612 614
        public DelegateCommand ConvertAddCommand { get; private set; }
613 615
        public DelegateCommand ConvertPathFileSearchCommand { get; private set; }
616
        public DelegateCommand Stop_ProcessCommand { get; private set; }
617

  
614 618

  
615 619
        #endregion
616 620

  
......
708 712

  
709 713
        #endregion
710 714

  
711

  
712 715
        #region Data Select
713 716

  
714 717
        /// <summary>
......
1276 1279

  
1277 1280
        #endregion
1278 1281

  
1282
        #region Data Delete
1283

  
1284
        private void DataDelete(object obj)
1285
        {
1286
            RadWindow.Alert("Do you want to delete it??", this.OnClosed);
1287
        }
1288

  
1289
        private async void OnClosed(object sender, WindowClosedEventArgs e)
1290
        {
1291
            {
1292
                var result = e.DialogResult;
1293
                if (result == true)
1294
                {
1295
                    if (SelectFilterConvertList.Count() > 1)
1296
                    {
1297
                        MessageBox.Show("하나만 클릭해 주세요!");
1298
                    }
1299
                    else
1300
                    {
1301
                        if (SelectRealConvert != null)
1302
                        {
1303
                            await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectRealConvert.ConvertID);
1304
                        }
1305
                        if (SelectFilterConvertList != null)
1306
                        {
1307
                            await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectFilterConvertList[0].ConvertID);
1308
                        }
1309
                    }
1310
                }
1311
            }
1312
        }
1313
        #endregion
1314

  
1315
        #region Stop Process
1316

  
1317
        private void Stop_Process(object obj)
1318
        {
1319
            if (SelectFilterConvertList.Count() > 1)
1320
            {
1321
                MessageBox.Show("하나만 클릭해 주세요");
1322
            }
1323
            else
1324
            {
1325
                //ID 찾아서 멈춰라 
1326
                RadWindow.Alert("프로세스 종료 할까요??", this.ON_Stop_Process);
1327

  
1328
            }
1329

  
1330
        }
1331

  
1332
        private void ON_Stop_Process(object sender, WindowClosedEventArgs e)
1333
        {
1334
            {
1335
                var result = e.DialogResult;
1336
                if (result == true)
1337
                {
1338
                    var process = Process.GetProcessesByName("Markus.Service.ConvertProcess");
1339

  
1340
                    for (int i = process.Count() - 1; i >= 0; i--)
1341
                    {
1342
                        try
1343
                        {
1344
                            var commandLines = process[i].Arguments().CommandLine;
1345

  
1346
                            if (commandLines.Count() > 0)
1347
                            {
1348
                                if (commandLines[0] == "TEST" && commandLines[1] == "1")
1349
                                {
1350
                                    process[i].Kill();
1351
                                }
1352
                                //if (ServiceStation.AliveConvertQueue.Count(f => f.ConvertID == commandLines[0]) == 0)
1353
                                //{
1354
                                //    process[i].Kill();
1355
                                //}
1356
                            }
1357
                        }
1358
                        catch (Exception ex)
1359
                        {
1360
                            System.Diagnostics.Debug.WriteLine(ex.ToString());
1361
                        }
1362
                    }
1363
                }
1364
            }
1365
        }
1366
        #endregion
1367

  
1279 1368
        #region DataFilter
1280 1369

  
1281 1370
        public void DataFilter(object obj)
......
1314 1403

  
1315 1404
        #endregion
1316 1405

  
1317
        #region Data Delete
1318

  
1319
        private void DataDelete(object obj)
1320
        {
1321
            RadWindow.Alert("Do you want to delete it??", this.OnClosed);
1322
        }
1323

  
1324
        private async void OnClosed(object sender, WindowClosedEventArgs e)
1325
        {
1326
            {
1327
                var result = e.DialogResult;
1328
                if (result == true)
1329
                {
1330
                    if (SelectFilterConvertList.Count() > 1)
1331
                    {
1332
                        MessageBox.Show("하나만 클릭해 주세요!");
1333
                    }
1334
                    else
1335
                    {
1336
                        if (SelectRealConvert != null)
1337
                        {
1338
                            await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectRealConvert.ConvertID);
1339
                        }
1340
                        if (SelectFilterConvertList != null)
1341
                        {
1342
                            await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectFilterConvertList[0].ConvertID);
1343
                        }
1344
                    }
1345
                }
1346
            }
1347
        }
1348
        #endregion
1349

  
1350 1406
        #region Data Export
1351 1407

  
1352 1408

  
......
1471 1527

  
1472 1528
        #endregion
1473 1529

  
1474

  
1475 1530
        #region ConvertPathFileSearch
1476 1531

  
1477 1532
        /// <summary>
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs
46 46
            ResetCommand = new DelegateCommand(Reset);
47 47
            ConverAddCommand = new DelegateCommand(ConverAdd);
48 48
            FinalPDFPathFileSearchCommand = new DelegateCommand(FinalPDFPathFileSearch);
49
            Stop_ProcessCommand = new DelegateCommand(Stop_Process);
49 50
        }
50 51

  
51 52
        #endregion
......
688 689
        public DelegateCommand ResetCommand { get; private set; }
689 690
        public DelegateCommand ConverAddCommand { get; private set; }
690 691
        public DelegateCommand FinalPDFPathFileSearchCommand { get; private set; }
692
        public DelegateCommand Stop_ProcessCommand { get; private set; }
691 693

  
692 694
        #endregion
693 695

  
......
785 787

  
786 788
        #endregion
787 789

  
788

  
789 790
        #region Data Select
790 791

  
791 792
        /// <summary>
......
1355 1356

  
1356 1357
        #endregion
1357 1358

  
1359
        #region Data Delete
1360

  
1361
        private void DataDelete(object obj)
1362
        {
1363
            RadWindow.Alert("do you want to delete it??", this.OnClosed);
1364
        }
1365

  
1366
        private async void OnClosed(object sender, WindowClosedEventArgs e)
1367
        {
1368
            var result = e.DialogResult;
1369
            if (result == true)
1370
            {
1371
                if (SelectFilterConvertList.Count() > 1)
1372
                {
1373
                    MessageBox.Show("하나만 클릭해 주세요!");
1374
                }
1375
                else
1376
                {
1377
                    if (SelectRealConvert != null)
1378
                    {
1379
                        await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectRealConvert.ConvertID);
1380
                    }
1381
                    if (SelectFilterConvertList != null)
1382
                    {
1383
                        await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectFilterConvertList[0].ConvertID);
1384
                    }
1385
                }
1386
            }
1387
        }
1388

  
1389

  
1390
        #endregion
1391

  
1392
        #region Stop Process
1393

  
1394
        private void Stop_Process(object obj)
1395
        {
1396
            if (SelectFilterConvertList.Count() > 1)
1397
            {
1398
                MessageBox.Show("하나만 클릭해 주세요");
1399
            }
1400
            else
1401
            {
1402
                RadWindow.Alert("프로세스 종료 할까요??", this.ON_Stop_Process);
1403

  
1404
            }
1405

  
1406
        }
1407

  
1408
        private void ON_Stop_Process(object sender, WindowClosedEventArgs e)
1409
        {
1410
            {
1411
                var result = e.DialogResult;
1412
                if (result == true)
1413
                {
1414
                    var process = Process.GetProcessesByName("Markus.Service.ConvertProcess");
1415

  
1416
                    for (int i = process.Count() - 1; i >= 0; i--)
1417
                    {
1418
                        try
1419
                        {
1420
                            var commandLines = process[i].Arguments().CommandLine;
1421

  
1422
                            if (commandLines.Count() > 0)
1423
                            {
1424
                                if (commandLines[0] == "TEST" && commandLines[1] == "1")
1425
                                {
1426
                                    process[i].Kill();
1427
                                }
1428
                                //if (ServiceStation.AliveConvertQueue.Count(f => f.ConvertID == commandLines[0]) == 0)
1429
                                //{
1430
                                //    process[i].Kill();
1431
                                //}
1432
                            }
1433
                        }
1434
                        catch (Exception ex)
1435
                        {
1436
                            System.Diagnostics.Debug.WriteLine(ex.ToString());
1437
                        }
1438
                    }
1439
                }
1440
            }
1441
        }
1442
        #endregion
1443

  
1358 1444
        #region DataFilter
1359 1445

  
1360 1446
        public void DataFilter(object obj)
......
1391 1477

  
1392 1478
        #endregion
1393 1479

  
1394
        #region Data Delete
1395

  
1396
        private void DataDelete(object obj)
1397
        {
1398
            RadWindow.Alert("do you want to delete it??", this.OnClosed);
1399
        }
1400

  
1401
        private async void OnClosed(object sender, WindowClosedEventArgs e)
1402
        {
1403
            var result = e.DialogResult;
1404
            if (result == true)
1405
            {
1406
                if (SelectFilterConvertList.Count() > 1)
1407
                {
1408
                    MessageBox.Show("하나만 클릭해 주세요!");
1409
                }
1410
                else
1411
                {
1412
                    if (SelectRealConvert != null)
1413
                    {
1414
                        await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectRealConvert.ConvertID);
1415
                    }
1416
                    if (SelectFilterConvertList != null)
1417
                    {
1418
                        await WcfClient.GET_SELECT_CONVERT_DELETEAsync(SelectFilterConvertList[0].ConvertID);
1419
                    }
1420
                }
1421
            }
1422
        }
1423

  
1424

  
1425
        #endregion
1426

  
1427 1480
        #region Data Export
1428 1481

  
1429 1482

  
......
1509 1562

  
1510 1563
        #endregion
1511 1564

  
1512

  
1513 1565
        #region ConvertAddDialog
1514 1566

  
1515 1567
        /// <summary>
......
1547 1599

  
1548 1600
        #endregion
1549 1601

  
1550

  
1551 1602
        #region FinalPDFPathFileSearch
1552 1603

  
1553 1604
        /// <summary>
......
1578 1629

  
1579 1630
        #endregion
1580 1631

  
1581

  
1582 1632
        #endregion
1583 1633
    }
1584 1634
}
ConvertService/ServiceBase/Markus.Service.StationController/Views/DashBoard.xaml
31 31
        <Style x:Key="TextBlockCountryStyle" TargetType="TextBlock">
32 32
            <Setter Property="FontSize" Value="12" />
33 33
            <Setter Property="Foreground" Value="Black" />
34
            <Setter Property="Margin" Value="0 0 40 0" />
35 34
        </Style>
36 35
        <Style TargetType="{x:Type controls:RowIndexColumn}">
37 36
            <Setter Property="TextAlignment" Value="Center"/>
......
39 38
        <Style x:Key="TextBlockCountryStyle_Exception" TargetType="TextBlock">
40 39
            <Setter Property="FontSize" Value="12" />
41 40
            <Setter Property="Foreground" Value="Blue" />
42
            <Setter Property="Margin" Value="0 0 0 0" />
41
            <Setter Property="Margin" Value="50 0 0 0" />
43 42
        </Style>
44 43
        <telerik:ChartPalette x:Key="ActualTargetChartPalette">
45 44
            <telerik:ChartPalette.GlobalEntries>
......
51 50
        <RectangleGeometry x:Key="SolidRectLegendGeometry" Rect="0 0 12 12" />
52 51
        <RectangleGeometry x:Key="LineSeriesLegendGeometry" Rect="0 5 12 2" />
53 52
        <VM:DashBoardViewModel x:Key="DashBoardViewModel"/>
54
        <controls:RightAlignedLabelStrategy x:Key="RightAlignedLabelStrategy"/>
55 53
        <DataTemplate x:Key="RowDetailsTemplate">
56 54
            <local:DataBaseViewInfo />
57 55
        </DataTemplate>
......
121 119
                                         LabelStyle="{StaticResource TextBlockCountryStyle}" />
122 120
                    </telerik:RadCartesianChart.VerticalAxis>
123 121
                    <telerik:RadCartesianChart.HorizontalAxis>
124
                        <telerik:LinearAxis  Minimum="0" Maximum="15000" MajorStep="3000" LabelStyle="{StaticResource axisLabelStyle}"/>
122
                        <telerik:LinearAxis  Minimum="0" Maximum="50000" MajorStep="10000" LabelStyle="{StaticResource axisLabelStyle}"/>
125 123
                    </telerik:RadCartesianChart.HorizontalAxis>
126 124
                    <telerik:RadCartesianChart.Series>
127
                        <telerik:BarSeries CategoryBinding="Project_NO" 
125
                        <telerik:BarSeries CategoryBinding="Project_NO" Name="CountBar"
128 126
                                   ValueBinding="Count" 
129 127
                                   ItemsSource="{Binding ConvertCOUNTDashBoard}"
130 128
                                   CombineMode="None" 
......
146 144
                                <telerik:SeriesLegendSettings Title="Count" MarkerGeometry="{StaticResource SolidRectLegendGeometry}" />
147 145
                            </telerik:BarSeries.LegendSettings>
148 146
                            <telerik:BarSeries.LabelDefinitions>
149
                                <telerik:ChartSeriesLabelDefinition Binding="StringCount"  DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
147
                                <telerik:ChartSeriesLabelDefinition Binding="StringCount"  DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
148
                                <telerik:ChartSeriesLabelDefinition Binding="ExceptionCount"  DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
150 149
                            </telerik:BarSeries.LabelDefinitions>
151 150
                        </telerik:BarSeries>
151

  
152

  
152 153
                        <telerik:BarSeries CategoryBinding="Project_NO" 
153 154
                                       ValueBinding="ExceptionCount" 
154 155
                                       ItemsSource="{Binding ConvertCOUNTDashBoard}"
155 156
                                       CombineMode="None" 
156
                                       ShowLabels="True" 
157
                                       ShowLabels="False" 
157 158
                                       ClipToPlotArea="True"   >
158
                            <telerik:BarSeries.LabelDefinitions>
159
                                <telerik:ChartSeriesLabelDefinition Binding="ExceptionCount" Format="{}{0:F1}" DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
160
                            </telerik:BarSeries.LabelDefinitions>
161 159
                            <telerik:BarSeries.PointAnimation>
162 160
                                <telerik:ChartMoveAnimation Delay="0:0:0.125" Duration="0:0:1.55" MoveAnimationType="Left" >
163 161
                                    <telerik:ChartMoveAnimation.Easing>
......
176 174
                        </telerik:BarSeries>
177 175
                    </telerik:RadCartesianChart.Series>
178 176
                </telerik:RadCartesianChart>
179

  
180 177
                <telerik:RadLegend Grid.Column="1" Grid.Row="0" Margin="24,4,0,0" MinWidth="76" Items="{Binding LegendItems, ElementName=chart}" />
181

  
182 178
                <telerik:RadGridView  GroupRenderMode="Flat" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"  
183 179
							 ItemsSource="{Binding DashBoard_Convert}" 
184 180
                             SelectionMode="Extended"
......
226 222
                            <telerik:GridViewDataColumn.CellTemplate>
227 223
                                <DataTemplate>
228 224
                                    <Grid>
229
                                        <!--<Grid.ColumnDefinitions>
230
                                            <ColumnDefinition/>
231
                                            <ColumnDefinition Width="Auto"/>
232
                                        </Grid.ColumnDefinitions>
233
                                        <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
234 225
                                        <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
235 226
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
236 227
                                            <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
......
248 239
                </telerik:RadGridView>
249 240
            </Grid>
250 241
        </Border>
242
        
243
        
251 244
        <TextBlock Text="FinalPDF Items" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Center" Margin="0,20,0,20"/>
252 245
        <Border BorderBrush="Black" BorderThickness="2" Grid.Row="3" Grid.Column="1" Margin="20,0,0,0">
253 246
            <Grid>
......
267 260
                                         LabelStyle="{StaticResource TextBlockCountryStyle}" />
268 261
                    </telerik:RadCartesianChart.VerticalAxis>
269 262
                    <telerik:RadCartesianChart.HorizontalAxis>
270
                        <telerik:LinearAxis  Minimum="0" Maximum="50000" MajorStep="10000" LabelStyle="{StaticResource axisLabelStyle}"/>
263
                        <telerik:LinearAxis  Minimum="0" Maximum="60000" MajorStep="15000" LabelStyle="{StaticResource axisLabelStyle}"/>
271 264
                    </telerik:RadCartesianChart.HorizontalAxis>
272 265
                    <telerik:RadCartesianChart.Series>
273 266
                        <telerik:BarSeries CategoryBinding="Project_NO" 
......
292 285
                                <telerik:SeriesLegendSettings Title="Count" MarkerGeometry="{StaticResource SolidRectLegendGeometry}" />
293 286
                            </telerik:BarSeries.LegendSettings>
294 287
                            <telerik:BarSeries.LabelDefinitions>
295
                                <telerik:ChartSeriesLabelDefinition Binding="StringCount"  DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
288
                                <telerik:ChartSeriesLabelDefinition Binding="StringCount"  DefaultVisualStyle="{StaticResource TextBlockCountryStyle}" HorizontalAlignment="Right" VerticalAlignment="Center" />
289
                                <telerik:ChartSeriesLabelDefinition Binding="ExceptionCount"  DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
296 290
                            </telerik:BarSeries.LabelDefinitions>
297 291
                        </telerik:BarSeries>
292

  
293

  
298 294
                        <telerik:BarSeries CategoryBinding="Project_NO" 
299 295
                                       ValueBinding="ExceptionCount" 
300 296
                                       ItemsSource="{Binding FinalPDFCOUNTDashBoard}"
301 297
                                       CombineMode="None" 
302
                                      ShowLabels="True" 
298
                                      ShowLabels="False" 
303 299
                                      ClipToPlotArea="True"   >
304
                            <telerik:BarSeries.LabelDefinitions>
305
                                <telerik:ChartSeriesLabelDefinition Binding="ExceptionCount" Format="{}{0:F1}" DefaultVisualStyle="{StaticResource TextBlockCountryStyle_Exception}" Strategy="{StaticResource RightAlignedLabelStrategy}" />
306
                            </telerik:BarSeries.LabelDefinitions>
307 300
                            <telerik:BarSeries.PointAnimation>
308 301
                                <telerik:ChartMoveAnimation Delay="0:0:0.125" Duration="0:0:1.55" MoveAnimationType="Left" >
309 302
                                    <telerik:ChartMoveAnimation.Easing>
......
355 348
											DataMemberBinding="{Binding ProjectNumber}" Width="*" />
356 349
                        <telerik:GridViewDataColumn Header="DocumentID"
357 350
											DataMemberBinding="{Binding DocumentID}" Width="*" />
358
                        <telerik:GridViewDataColumn Header="DocInfoID"
359
											DataMemberBinding="{Binding DocInfo_ID}" Width="*" />
360
                        <telerik:GridViewDataColumn Header="MarkusInfoID"
361
											DataMemberBinding="{Binding MarkupInfo_ID}" Width="*" />
362 351
                        <telerik:GridViewDataColumn Header="Create UserID"
363 352
											DataMemberBinding="{Binding Create_User_ID}" Width="*" />
364 353
                        <telerik:GridViewDataColumn Header="CurrentPageNo"
......
380 369
                            <telerik:GridViewDataColumn.CellTemplate>
381 370
                                <DataTemplate>
382 371
                                    <Grid>
383
                                        <!--<Grid.ColumnDefinitions>
384
                                            <ColumnDefinition/>
385
                                            <ColumnDefinition Width="Auto"/>
386
                                        </Grid.ColumnDefinitions>
387
                                        <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
388 372
                                        <telerik:RadButton Grid.Column="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
389 373
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DashBoardViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
390 374
                                            <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml
137 137
                <telerik:RadGridView.Columns>
138 138
                    <telerik:GridViewToggleRowDetailsColumn />
139 139
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
140
                    <telerik:GridViewDataColumn Header="Convert ID" 
141
											DataMemberBinding="{Binding ConvertID}" Width="*" />
140 142
                    <telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*"  >
141 143
                        <telerik:GridViewDataColumn.CellTemplate>
142 144
                            <DataTemplate>
......
167 169
                        <telerik:GridViewDataColumn.CellTemplate>
168 170
                            <DataTemplate>
169 171
                                <Grid>
170
                                    <!--<Grid.ColumnDefinitions>
172
                                    <Grid.ColumnDefinitions>
171 173
                                        <ColumnDefinition/>
172 174
                                        <ColumnDefinition Width="Auto"/>
173
                                    </Grid.ColumnDefinitions>-->
174
                                    <!--<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
175
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
175
                                    </Grid.ColumnDefinitions>
176
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
177
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
176 178
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
177 179
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
178 180
                                    </telerik:RadButton>
......
183 185

  
184 186
                    <telerik:GridViewDataColumn Header="CreateTime" IsReadOnly="True"   Background="Transparent" 
185 187
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
188
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
189
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
190
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
191
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
186 192
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
187 193
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
188 194
                </telerik:RadGridView.Columns>
......
214 220
                        <telerik:RadMenuItem  Header="Convert"  Command="{Binding ConvertCommand}"/>
215 221
                        <telerik:RadMenuItem Header="Validation"  Command="{Binding ValidateCommand}"/>
216 222
                        <telerik:RadMenuItem Header="Delete"  Command="{Binding DeleteCommand}"/>
223
                        <telerik:RadMenuItem Header="Stop Process"  Command="{Binding Stop_ProcessCommand}"/>
217 224
                    </telerik:RadContextMenu>
218 225
                </telerik:RadContextMenu.ContextMenu>
219 226
                <telerik:RadGridView.Columns>
220 227
                    <telerik:GridViewToggleRowDetailsColumn />
221 228
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
222 229

  
230
                    <telerik:GridViewDataColumn Header="Convert ID" 
231
											DataMemberBinding="{Binding ConvertID}" Width="*" />
223 232
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
224 233
                        <telerik:GridViewDataColumn.CellTemplate>
225 234
                            <DataTemplate>
......
250 259
                        <telerik:GridViewDataColumn.CellTemplate>
251 260
                            <DataTemplate>
252 261
                                <Grid>
253
                                    <!--<Grid.ColumnDefinitions>
262
                                    <Grid.ColumnDefinitions>
254 263
                                        <ColumnDefinition/>
255 264
                                        <ColumnDefinition Width="Auto"/>
256
                                    </Grid.ColumnDefinitions>-->
257
                                    <!--<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
258
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
265
                                    </Grid.ColumnDefinitions>
266
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
267
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
259 268
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
260 269
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
261 270
                                    </telerik:RadButton>
......
266 275

  
267 276
                    <telerik:GridViewDataColumn Header="CreateTime"  IsReadOnly="True"
268 277
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
278
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
279
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
280
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
281
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
269 282
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
270 283
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
271 284
                </telerik:RadGridView.Columns>
272 285
            </telerik:RadGridView>
273 286
        </telerik:RadExpander>
287
        
274 288
        <telerik:RadExpander Grid.Row="4" ExpandDirection="Down" BorderThickness="0"  VerticalAlignment="Stretch" Margin="0,0,0,10"
275 289
                  ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
276 290
                             telerik:AnimationManager.IsAnimationEnabled="False"  IsExpanded ="{Binding  AliveShow, Mode=TwoWay}">
......
291 305
                             SelectedItem="{Binding SelectAliveConvert, Mode=TwoWay}"
292 306
							 AutoGenerateColumns="False" CanUserFreezeColumns="False" RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
293 307
                             ColumnWidth="*"  ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True" Grid.Row="1" >
308
                <telerik:RadContextMenu.ContextMenu>
309
                    <telerik:RadContextMenu>
310
                        <telerik:RadMenuItem  Header="Convert"  Command="{Binding ConvertCommand}"/>
311
                        <telerik:RadMenuItem Header="Validation"  Command="{Binding ValidateCommand}"/>
312
                        <telerik:RadMenuItem Header="Delete"  Command="{Binding DeleteCommand}"/>
313
                        <telerik:RadMenuItem Header="Stop Process"  Command="{Binding Stop_ProcessCommand}"/>
314
                    </telerik:RadContextMenu>
315
                </telerik:RadContextMenu.ContextMenu>
294 316
                <telerik:RadGridView.Columns>
295 317
                    <telerik:GridViewToggleRowDetailsColumn />
296 318
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
297

  
319
                    <telerik:GridViewDataColumn Header="Convert ID" 
320
											DataMemberBinding="{Binding ConvertID}" Width="*" />
298 321
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
299 322
                        <telerik:GridViewDataColumn.CellTemplate>
300 323
                            <DataTemplate>
......
325 348
                        <telerik:GridViewDataColumn.CellTemplate>
326 349
                            <DataTemplate>
327 350
                                <Grid>
328
                                    <!--<Grid.ColumnDefinitions>
351
                                    <Grid.ColumnDefinitions>
329 352
                                        <ColumnDefinition/>
330 353
                                        <ColumnDefinition Width="Auto"/>
331
                                    </Grid.ColumnDefinitions-->
332
                                    <!--<TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
333
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
354
                                    </Grid.ColumnDefinitions>
355
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
356
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
334 357
                                                   Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
335 358
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
336 359
                                    </telerik:RadButton>
......
340 363
                    </telerik:GridViewDataColumn>
341 364
                    <telerik:GridViewDataColumn Header="CreateTime"  IsReadOnly="True"
342 365
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
366
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
367
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
368
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
369
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
343 370
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
344 371
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
345 372
                </telerik:RadGridView.Columns>
ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFView.xaml
241 241
                <telerik:RadGridView.Columns>
242 242
                    <telerik:GridViewToggleRowDetailsColumn />
243 243
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
244

  
245
                    <telerik:GridViewDataColumn Header="Convert ID" 
246
											DataMemberBinding="{Binding ConvertID}" Width="*" />
244 247
                    <telerik:GridViewDataColumn x:Name="commend" Header="Markus " Width="0.5*"  CellStyle="{StaticResource StretchCellStyle}">
245 248
                        <telerik:GridViewDataColumn.CellTemplate>
246 249
                            <DataTemplate>
......
279 282
                        <telerik:GridViewDataColumn.CellTemplate>
280 283
                            <DataTemplate>
281 284
                                <Grid>
282
                                    <!--<Grid.ColumnDefinitions>
285
                                    <Grid.ColumnDefinitions>
283 286
                                        <ColumnDefinition/>
284 287
                                        <ColumnDefinition Width="Auto"/>
285 288
                                    </Grid.ColumnDefinitions>
286
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
287
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
289
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
290
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
288 291
                                                   Command="{Binding FinalPDFPathFileSearchCommand, Source={StaticResource FinalPDFViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
289 292
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
290 293
                                    </telerik:RadButton>
......
294 297
                    </telerik:GridViewDataColumn>
295 298
                    <telerik:GridViewDataColumn Header="CreateTime" 
296 299
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*"  />
300
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
301
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
302
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
303
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
297 304
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
298 305
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
299 306
                </telerik:RadGridView.Columns>
......
325 332
                        <telerik:RadMenuItem  Header="Convert"  Command="{Binding ConvertCommand}"/>
326 333
                        <telerik:RadMenuItem Header="Validation"  Command="{Binding ValidateCommand}"/>
327 334
                        <telerik:RadMenuItem Header="Delete"  Command="{Binding DeleteCommand}"/>
335
                        <telerik:RadMenuItem Header="Stop Process"  Command="{Binding Stop_ProcessCommand}"/>
328 336
                    </telerik:RadContextMenu>
329 337
                </telerik:RadContextMenu.ContextMenu>
330 338
                <telerik:RadGridView.Columns>
331 339
                    <telerik:GridViewToggleRowDetailsColumn />
332 340
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
333 341

  
334
                    <telerik:GridViewDataColumn Header=" ID "
335
											DataMemberBinding="{Binding ConvertID}" Width="1.5*" />
342
                    <telerik:GridViewDataColumn Header="Convert ID" 
343
											DataMemberBinding="{Binding ConvertID}" Width="*" />
336 344

  
337 345
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
338 346
                        <telerik:GridViewDataColumn.CellTemplate>
......
383 391
                        <telerik:GridViewDataColumn.CellTemplate>
384 392
                            <DataTemplate>
385 393
                                <Grid>
386
                                    <!--<Grid.ColumnDefinitions>
394
                                    <Grid.ColumnDefinitions>
387 395
                                        <ColumnDefinition/>
388 396
                                        <ColumnDefinition Width="Auto"/>
389 397
                                    </Grid.ColumnDefinitions>
390
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
391
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
398
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
399
                                    <telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" Grid.Column="1"
392 400
                                                   Command="{Binding FinalPDFPathFileSearchCommand, Source={StaticResource FinalPDFViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
393 401
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
394 402
                                    </telerik:RadButton>
......
399 407

  
400 408
                    <telerik:GridViewDataColumn Header="CreateTime" 
401 409
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
410
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
411
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
412
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
413
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
402 414
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
403 415
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
404 416
                </telerik:RadGridView.Columns>
......
423 435
                             SelectedItem="{Binding SelectAliveConvert, Mode=TwoWay}"
424 436
							 AutoGenerateColumns="False" CanUserFreezeColumns="False" RowDetailsTemplate="{StaticResource RowDetailsTemplate}"
425 437
                             ColumnWidth="*"  ScrollViewer.CanContentScroll="False" IsFilteringAllowed="True" Grid.Row="1" >
438
                <telerik:RadContextMenu.ContextMenu>
439
                    <telerik:RadContextMenu>
440
                        <telerik:RadMenuItem  Header="Convert"  Command="{Binding ConvertCommand}"/>
441
                        <telerik:RadMenuItem Header="Validation"  Command="{Binding ValidateCommand}"/>
442
                        <telerik:RadMenuItem Header="Delete"  Command="{Binding DeleteCommand}"/>
443
                        <telerik:RadMenuItem Header="Stop Process"  Command="{Binding Stop_ProcessCommand}"/>
444
                    </telerik:RadContextMenu>
445
                </telerik:RadContextMenu.ContextMenu>
426 446
                <telerik:RadGridView.Columns>
427 447
                    <telerik:GridViewToggleRowDetailsColumn />
428 448
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />
429 449

  
430
                    <telerik:GridViewDataColumn Header=" ID "
431
											DataMemberBinding="{Binding ConvertID}" Width="1.5*" />
450
                    <telerik:GridViewDataColumn Header="Convert ID" 
451
											DataMemberBinding="{Binding ConvertID}" Width="*" />
432 452

  
433 453
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*" CellStyle="{StaticResource StretchCellStyle}">
434 454
                        <telerik:GridViewDataColumn.CellTemplate>
......
479 499
                        <telerik:GridViewDataColumn.CellTemplate>
480 500
                            <DataTemplate>
481 501
                                <Grid>
482
                                    <!--<Grid.ColumnDefinitions>
502
                                    <Grid.ColumnDefinitions>
483 503
                                        <ColumnDefinition/>
484 504
                                        <ColumnDefinition Width="Auto"/>
485 505
                                    </Grid.ColumnDefinitions>
486
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>-->
487
                                    <telerik:RadButton Grid.Column="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"
506
                                    <TextBox TextAlignment="Left" Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
507
                                    <telerik:RadButton Grid.Column="1" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" 
488 508
                                                   Command="{Binding FinalPDFPathFileSearchCommand, Source={StaticResource FinalPDFViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
489 509
                                        <Image Source="/Markus.Service.StationController;component/Resources/File_Search_Icon.png"  Stretch="None" />
490 510
                                    </telerik:RadButton>
......
495 515

  
496 516
                    <telerik:GridViewDataColumn Header="CreateTime" 
497 517
											DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
518
                    <telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"   Background="Transparent" 
519
											DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
520
                    <telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"   Background="Transparent" 
521
											DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
498 522
                    <telerik:GridViewDataColumn Header="TotalTime" IsReadOnly="True"   Background="Transparent" 
499 523
											DataMemberBinding="{Binding TotalTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
500 524
                </telerik:RadGridView.Columns>
ConvertService/ServiceBase/ServiceController.sln
21 21
EndProject
22 22
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StationControllerService", "StationControllerService\StationControllerService.csproj", "{B06C0A20-BC30-4A3E-8D74-E0E2FF55510F}"
23 23
EndProject
24
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markus.ConvertProcessTest", "Markus.ConvertProcessTest\Markus.ConvertProcessTest.csproj", "{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}"
25
EndProject
26
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markus.Service.Station", "Markus.Service.Station\Markus.Service.Station.csproj", "{BF8B3B13-30D5-482C-8452-A7511E96DE97}"
27
EndProject
24 28
Global
25 29
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
26 30
		AppVeyor|Any CPU = AppVeyor|Any CPU
......
151 155
		{B06C0A20-BC30-4A3E-8D74-E0E2FF55510F}.Release|x64.Build.0 = Release|Any CPU
152 156
		{B06C0A20-BC30-4A3E-8D74-E0E2FF55510F}.Release|x86.ActiveCfg = Release|Any CPU
153 157
		{B06C0A20-BC30-4A3E-8D74-E0E2FF55510F}.Release|x86.Build.0 = Release|Any CPU
158
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
159
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
160
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.AppVeyor|x64.ActiveCfg = Release|Any CPU
161
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.AppVeyor|x64.Build.0 = Release|Any CPU
162
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.AppVeyor|x86.ActiveCfg = Release|Any CPU
163
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.AppVeyor|x86.Build.0 = Release|Any CPU
164
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
166
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Debug|x64.ActiveCfg = Debug|Any CPU
167
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Debug|x64.Build.0 = Debug|Any CPU
168
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Debug|x86.ActiveCfg = Debug|Any CPU
169
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Debug|x86.Build.0 = Debug|Any CPU
170
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
171
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|Any CPU.Build.0 = Release|Any CPU
172
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|x64.ActiveCfg = Release|Any CPU
173
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|x64.Build.0 = Release|Any CPU
174
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|x86.ActiveCfg = Release|Any CPU
175
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|x86.Build.0 = Release|Any CPU
176
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
177
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
178
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.AppVeyor|x64.ActiveCfg = Release|x64
179
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.AppVeyor|x64.Build.0 = Release|x64
180
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.AppVeyor|x86.ActiveCfg = Release|Any CPU
181
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.AppVeyor|x86.Build.0 = Release|Any CPU
182
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Debug|Any CPU.Build.0 = Debug|Any CPU
184
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Debug|x64.ActiveCfg = Debug|x64
185
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Debug|x64.Build.0 = Debug|x64
186
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Debug|x86.ActiveCfg = Debug|Any CPU
187
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Debug|x86.Build.0 = Debug|Any CPU
188
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|Any CPU.ActiveCfg = Release|Any CPU
189
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|Any CPU.Build.0 = Release|Any CPU
190
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|x64.ActiveCfg = Release|x64
191
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|x64.Build.0 = Release|x64
192
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|x86.ActiveCfg = Release|Any CPU
193
		{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|x86.Build.0 = Release|Any CPU
154 194
	EndGlobalSection
155 195
	GlobalSection(SolutionProperties) = preSolution
156 196
		HideSolutionNode = FALSE

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)