프로젝트

일반

사용자정보

개정판 c68259ac

IDc68259ac61674041073a72338fc1e9db828dc223
상위 f5ec88b8
하위 6466bd2d

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

FianlPDF GridView 수정

Change-Id: Id007dfac8aa70d973a3ca8597ca260e02896753a

차이점 보기:

ConvertService/ServiceBase/Markus.Service.Station/Markus.Service.Station.csproj
95 95 
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
96 96 
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
97 97 
    </Reference>
98 
    <Reference Include="Markus.Service.Convert">
99 
      <HintPath>..\Markus.Service.Convert\bin\Debug\Markus.Service.Convert.dll</HintPath>
100 
    </Reference>
101 
    <Reference Include="Markus.Service.ConvertProcess">
102 
      <HintPath>..\Markus.Service.ConvertProcess\bin\Debug\Markus.Service.ConvertProcess.exe</HintPath>
103 
    </Reference>
104 
    <Reference Include="Markus.Service.DataBase">
105 
      <HintPath>..\Markus.Service.DataBase\bin\Debug\Markus.Service.DataBase.dll</HintPath>
106 
    </Reference>
107 
    <Reference Include="Markus.Service.Interface">
108 
      <HintPath>..\IServiceBase\bin\Debug\Markus.Service.Interface.dll</HintPath>
109 
    </Reference>
110 
    <Reference Include="Markus.Service.IWcfService">
111 
      <HintPath>..\Markus.Service.WcfService\bin\Debug\Markus.Service.IWcfService.dll</HintPath>
112 
    </Reference>
98 113 
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
99 114 
      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
100 115 
    </Reference>
......
182 197 
    </EmbeddedResource>
183 198 
  </ItemGroup>
184 199 
  <ItemGroup>
185 
    <ProjectReference Include="..\IServiceBase\Markus.Service.Interface.csproj">
186 
      <Project>{4a465fd0-8130-4d6b-a65f-c3cd6cc355a4}</Project>
187 
      <Name>Markus.Service.Interface</Name>
188 
    </ProjectReference>
189 
    <ProjectReference Include="..\Markus.Service.ConvertProcess\Markus.Service.ConvertProcess.csproj">
190 
      <Project>{3f94fecf-4326-4452-8067-9f7b45d9bc6c}</Project>
191 
      <Name>Markus.Service.ConvertProcess</Name>
192 
    </ProjectReference>
193 
    <ProjectReference Include="..\Markus.Service.Convert\Markus.Service.Convert.csproj">
194 
      <Project>{867e065c-3c22-47b1-9c2a-130a78dddd51}</Project>
195 
      <Name>Markus.Service.Convert</Name>
196 
    </ProjectReference>
197 
    <ProjectReference Include="..\Markus.Service.DataBase\Markus.Service.DataBase.csproj">
198 
      <Project>{400736fb-92c9-4bc0-b447-e8274103d813}</Project>
199 
      <Name>Markus.Service.DataBase</Name>
200 
    </ProjectReference>
201 200 
    <ProjectReference Include="..\Markus.Service.Extensions\Markus.Service.Extensions.csproj">
202 201 
      <Project>{5F983789-3E8F-4F9A-A601-138C3A83CA5F}</Project>
203 202 
      <Name>Markus.Service.Extensions</Name>
......
206 205 
      <Project>{691078d3-be0e-4697-bab6-ed3aca842d19}</Project>
207 206 
      <Name>Markus.Service.WcfClient</Name>
208 207 
    </ProjectReference>
209 
    <ProjectReference Include="..\Markus.Service.WcfService\Markus.Service.IWcfService.csproj">
210 
      <Project>{0523c15e-b197-4c34-83ba-d62b384e2b77}</Project>
211 
      <Name>Markus.Service.IWcfService</Name>
212 
    </ProjectReference>
213 208 
  </ItemGroup>
214 209 
  <ItemGroup>
215 210 
    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
566 566 
            }
567 567 
        }
568 568 

  		




  569
  
  
    
        public bool _AliveShow;


  		




  
  569
  
    
        public bool _AliveShow = false;


  		




  570
  570
  
    
        public bool AliveShow


  		




  571
  571
  
    
        {


  		




  572
  572
  
    
            get => _AliveShow;


  		




  573
  573
  
    
            set


  		




  574
  574
  
    
            {


  		




  575
  
  
    
                if (_AliveShow = !value)


  		




  576
  
  
    
                {


  		




  577
  
  
    
                    _AliveShow = false;


  		




  578
  
  
    
                }


  		




  579
  575
  
    
                _AliveShow = value;


  		




  580
  576
  
    
                OnPropertyChanged(() => AliveShow);


  		




  581
  577
  
    
            }


  		




  ......




  1331
  1327
  
    

  		




  1332
  1328
  
    
        private void ON_Stop_Process(object sender, WindowClosedEventArgs e)


  		




  1333
  1329
  
    
        {


  		




  
  1330
  
    
            var result = e.DialogResult;


  		




  
  1331
  
    
            if (result == true)


  		




  1334
  1332
  
    
            {


  		




  1335
  
  
    
                var result = e.DialogResult;


  		




  1336
  
  
    
                if (result == true)


  		




  1337
  
  
    
                {


  		




  1338
  
  
    
                    var process = Process.GetProcessesByName("Markus.Service.ConvertProcess");


  		




  
  1333
  
    
                var process = Process.GetProcessesByName("Markus.Service.ConvertProcess");


  		




  1339
  1334
  
    

  		




  1340
  
  
    
                    for (int i = process.Count() - 1; i >= 0; i--)


  		




  
  1335
  
    
                for (int i = process.Count() - 1; i >= 0; i--)


  		




  
  1336
  
    
                {


  		




  
  1337
  
    
                    try


  		




  1341
  1338
  
    
                    {


  		




  1342
  
  
    
                        try


  		




  1343
  
  
    
                        {


  		




  1344
  
  
    
                            var commandLines = process[i].Arguments().CommandLine;


  		




  
  1339
  
    
                        var commandLines = process[i].Arguments().CommandLine;


  		




  1345
  1340
  
    

  		




  1346
  
  
    
                            if (commandLines.Count() > 0)


  		




  
  1341
  
    
                        if (commandLines.Count() > 0)


  		




  
  1342
  
    
                        {


  		




  
  1343
  
    
                            if (commandLines[0] == "TEST" && commandLines[1] == "1")


  		




  1347
  1344
  
    
                            {


  		




  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
  
  
    
                                //}


  		




  
  1345
  
    
                                process[i].Kill();


  		




  1356
  1346
  
    
                            }


  		




  
  1347
  
    
                            //if (AliveItems.Count(f => f.ConvertID == commandLines[0]) == 0) //프로세스 종료후 그 종료된 프로세스 누르면 real에 있던 애들 다 convert됨 


  		




  
  1348
  
    
                            //{


  		




  
  1349
  
    
                            //    process[i].Kill();


  		




  
  1350
  
    
                            //}


  		




  1357
  1351
  
    
                        }


  		




  1358
  
  
    
                        catch (Exception ex)


  		




  1359
  
  
    
                        {


  		




  1360
  
  
    
                            System.Diagnostics.Debug.WriteLine(ex.ToString());


  		




  1361
  
  
    
                        }


  		




  
  1352
  
    
                    }


  		




  
  1353
  
    
                    catch (Exception ex)


  		




  
  1354
  
    
                    {


  		




  
  1355
  
    
                        System.Diagnostics.Debug.WriteLine(ex.ToString());


  		




  1362
  1356
  
    
                    }


  		




  1363
  1357
  
    
                }


  		




  1364
  1358
  
    
            }


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs
    
  





  1407
  1407
  
    

  		




  1408
  1408
  
    
        private void ON_Stop_Process(object sender, WindowClosedEventArgs e)


  		




  1409
  1409
  
    
        {


  		




  
  1410
  
    
            var result = e.DialogResult;


  		




  
  1411
  
    
            if (result == true)


  		




  1410
  1412
  
    
            {


  		




  1411
  
  
    
                var result = e.DialogResult;


  		




  1412
  
  
    
                if (result == true)


  		




  1413
  
  
    
                {


  		




  1414
  
  
    
                    var process = Process.GetProcessesByName("Markus.Service.ConvertProcess");


  		




  
  1413
  
    
                var process = Process.GetProcessesByName("Markus.Service.ConvertProcess");


  		




  1415
  1414
  
    

  		




  1416
  
  
    
                    for (int i = process.Count() - 1; i >= 0; i--)


  		




  
  1415
  
    
                for (int i = process.Count() - 1; i >= 0; i--)


  		




  
  1416
  
    
                {


  		




  
  1417
  
    
                    try


  		




  1417
  1418
  
    
                    {


  		




  1418
  
  
    
                        try


  		




  1419
  
  
    
                        {


  		




  1420
  
  
    
                            var commandLines = process[i].Arguments().CommandLine;


  		




  
  1419
  
    
                        var commandLines = process[i].Arguments().CommandLine;


  		




  1421
  1420
  
    

  		




  1422
  
  
    
                            if (commandLines.Count() > 0)


  		




  
  1421
  
    
                        if (commandLines.Count() > 0)


  		




  
  1422
  
    
                        {


  		




  
  1423
  
    
                            if (commandLines[0] == "TEST" && commandLines[1] == "1")


  		




  1423
  1424
  
    
                            {


  		




  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
  
  
    
                                //}


  		




  
  1425
  
    
                                process[i].Kill();


  		




  1432
  1426
  
    
                            }


  		




  
  1427
  
    
                            //if (AliveItems.Count(f => f.ConvertID == commandLines[0]) == 0)


  		




  
  1428
  
    
                            //{


  		




  
  1429
  
    
                            //    process[i].Kill();


  		




  
  1430
  
    
                            //}


  		




  1433
  1431
  
    
                        }


  		




  1434
  
  
    
                        catch (Exception ex)


  		




  1435
  
  
    
                        {


  		




  1436
  
  
    
                            System.Diagnostics.Debug.WriteLine(ex.ToString());


  		




  1437
  
  
    
                        }


  		




  
  1432
  
    
                    }


  		




  
  1433
  
    
                    catch (Exception ex)


  		




  
  1434
  
    
                    {


  		




  
  1435
  
    
                        System.Diagnostics.Debug.WriteLine(ex.ToString());


  		




  1438
  1436
  
    
                    }


  		




  1439
  1437
  
    
                }


  		




  1440
  1438
  
    
            }


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml
    
  





  148
  148
  
    
                            </DataTemplate>


  		




  149
  149
  
    
                        </telerik:GridViewDataColumn.CellTemplate>


  		




  150
  150
  
    
                    </telerik:GridViewDataColumn>


  		




  
  151
  
    
                    


  		




  151
  152
  
    
                    <telerik:GridViewDataColumn Header="ProjectNO" 


  		




  152
  153
  
    
											DataMemberBinding="{Binding ProjectNumber}" Width="*" />


  		




  153
  154
  
    
                    <telerik:GridViewDataColumn Header="CurrentPageNo" 


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/Views/FinalPDFView.xaml
    
  





  350
  350
  
    
                            </DataTemplate>


  		




  351
  351
  
    
                        </telerik:GridViewDataColumn.CellTemplate>


  		




  352
  352
  
    
                    </telerik:GridViewDataColumn>


  		




  353
  
  
    

  		




  354
  
  
    
                    <telerik:GridViewToggleRowDetailsColumn />


  		




  355
  
  
    
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />


  		




  356
  
  
    
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*"  CellStyle="{StaticResource StretchCellStyle}">


  		




  357
  
  
    
                        <telerik:GridViewDataColumn.CellTemplate>


  		




  358
  
  
    
                            <DataTemplate>


  		




  359
  
  
    
                                <telerik:RadButton Content="Click" BorderThickness="0"


  		




  360
  
  
    
                                                   Background="Transparent"


  		




  361
  
  
    
                                                   Command="{Binding MarkusLinkCommand, Source={StaticResource FinalPDFViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>


  		




  362
  
  
    
                            </DataTemplate>


  		




  363
  
  
    
                        </telerik:GridViewDataColumn.CellTemplate>


  		




  364
  
  
    
                    </telerik:GridViewDataColumn>


  		




  365
  353
  
    
                    <telerik:GridViewDataColumn Header="ProjectNO" 


  		




  366
  354
  
    
											DataMemberBinding="{Binding ProjectNumber}" Width="*" />


  		




  367
  355
  
    
                    <telerik:GridViewDataColumn Header="DocumentID"


  		




  ......




  458
  446
  
    
                            </DataTemplate>


  		




  459
  447
  
    
                        </telerik:GridViewDataColumn.CellTemplate>


  		




  460
  448
  
    
                    </telerik:GridViewDataColumn>


  		




  461
  
  
    

  		




  462
  
  
    
                    <telerik:GridViewToggleRowDetailsColumn />


  		




  463
  
  
    
                    <controls:RowIndexColumn Header="#" Width="30" CellStyle="{StaticResource RowNumberStyle}" />


  		




  464
  
  
    
                    <telerik:GridViewDataColumn Header="Markus " Width="0.5*"  CellStyle="{StaticResource StretchCellStyle}">


  		




  465
  
  
    
                        <telerik:GridViewDataColumn.CellTemplate>


  		




  466
  
  
    
                            <DataTemplate>


  		




  467
  
  
    
                                <telerik:RadButton Content="Click" BorderThickness="0"


  		




  468
  
  
    
                                                   Background="Transparent"


  		




  469
  
  
    
                                                   Command="{Binding MarkusLinkCommand, Source={StaticResource FinalPDFViewModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}"/>


  		




  470
  
  
    
                            </DataTemplate>


  		




  471
  
  
    
                        </telerik:GridViewDataColumn.CellTemplate>


  		




  472
  
  
    
                    </telerik:GridViewDataColumn>


  		




  473
  449
  
    
                    <telerik:GridViewDataColumn Header="ProjectNO" 


  		




  474
  450
  
    
											DataMemberBinding="{Binding ProjectNumber}" Width="*" />


  		




  475
  451
  
    
                    <telerik:GridViewDataColumn Header="DocumentID"


  		












  

    
      ConvertService/ServiceBase/ServiceController.sln
    
  





  23
  23
  
    
EndProject


  		




  24
  24
  
    
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markus.ConvertProcessTest", "Markus.ConvertProcessTest\Markus.ConvertProcessTest.csproj", "{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}"


  		




  25
  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


  		




  28
  26
  
    
Global


  		




  29
  27
  
    
	GlobalSection(SolutionConfigurationPlatforms) = preSolution


  		




  30
  28
  
    
		AppVeyor|Any CPU = AppVeyor|Any CPU


  		




  ......




  173
  171
  
    
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|x64.Build.0 = Release|Any CPU


  		




  174
  172
  
    
		{9D5B0CA0-329D-40AF-BA0D-B727080C19EB}.Release|x86.ActiveCfg = Release|Any CPU


  		




  175
  173
  
    
		{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


  		




  194
  174
  
    
	EndGlobalSection


  		




  195
  175
  
    
	GlobalSection(SolutionProperties) = preSolution


  		




  196
  176
  
    
		HideSolutionNode = FALSE


  		












내보내기  Unified diff




         
        

    















   



  

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