개정판 e139272d
ProjectNoFilter Combobox변경
Change-Id: Ib63ffc94500267620556a1695cf85e3f65ddd15f
| ConvertService/ServiceBase/Markus.Service.StationController/Controls/DatabaseFilter.xaml | ||
|---|---|---|
| 38 | 38 |
<ColumnDefinition Width="Auto"/> |
| 39 | 39 |
<ColumnDefinition Width="*"/> |
| 40 | 40 |
</Grid.ColumnDefinitions> |
| 41 |
|
|
| 42 |
<TextBlock Text="ProjectNumber " Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
|
| 41 |
|
|
| 42 |
<!--<TextBlock Text="ProjectNumber " Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
|
| 43 | 43 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" Grid.Row="0" Grid.Column="1" maskedInput:MaskedInputExtensions.MaxTextLength="1000" |
| 44 | 44 |
EmptyContent="ProjectNumber" InputBehavior="Replace" HorizontalContentAlignment="Stretch" Mask="" |
| 45 | 45 |
TextMode="PlainText" Value="{Binding ProjectNo,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay, ElementName=userControl}"
|
| 46 |
VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0" /> |
|
| 46 |
VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0" />--> |
|
| 47 |
<telerik:RadComboBox Grid.ColumnSpan="2" Height="30" |
|
| 48 |
DisplayMemberPath="Project_NOAndProject_Name" |
|
| 49 |
ItemsSource="{Binding ProjectNames}"
|
|
| 50 |
SelectedItem="{Binding ProjectNumberFilter}"
|
|
| 51 |
AllowMultipleSelection="False" |
|
| 52 |
EmptyText="Project_NO : Project_Name"/> |
|
| 47 | 53 |
|
| 48 | 54 |
<TextBlock Text="UniqueKey " Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
| 49 | 55 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000" |
| ... | ... | |
| 111 | 117 |
HorizontalAlignment="Stretch" |
| 112 | 118 |
SelectedValue="{Binding SelectedCreateTimeBegin ,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged }" >
|
| 113 | 119 |
</telerik:RadDateTimePicker> |
| 114 |
|
|
| 120 |
|
|
| 115 | 121 |
<TextBlock Text=" ~ " VerticalAlignment="Center"/> |
| 116 | 122 |
<telerik:RadDateTimePicker x:Name="datePicker2" Width="200" |
| 117 | 123 |
InputMode="DateTimePicker" HorizontalAlignment="Stretch" |
| ConvertService/ServiceBase/Markus.Service.StationController/Data/ProjectName.cs | ||
|---|---|---|
| 1 |
using System; |
|
| 2 |
using System.Collections.Generic; |
|
| 3 |
using System.ComponentModel; |
|
| 4 |
using System.Linq; |
|
| 5 |
using System.Text; |
|
| 6 |
using System.Threading.Tasks; |
|
| 7 |
|
|
| 8 |
namespace Markus.Service.StationController.Data |
|
| 9 |
{
|
|
| 10 |
public class ProjectName : INotifyPropertyChanged |
|
| 11 |
{
|
|
| 12 |
public event PropertyChangedEventHandler PropertyChanged; |
|
| 13 |
|
|
| 14 |
private void OnPropertyChanged(string propertyName) |
|
| 15 |
{
|
|
| 16 |
if (PropertyChanged != null) |
|
| 17 |
{
|
|
| 18 |
PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); |
|
| 19 |
} |
|
| 20 |
|
|
| 21 |
} |
|
| 22 |
|
|
| 23 |
public ProjectName() |
|
| 24 |
{
|
|
| 25 |
|
|
| 26 |
} |
|
| 27 |
|
|
| 28 |
public ProjectName(string projectNO, string projectname) |
|
| 29 |
{
|
|
| 30 |
Project_NO = projectNO; |
|
| 31 |
Project_Name = projectname; |
|
| 32 |
Project_NOAndProject_Name = Project_NO + " : " + Project_Name; |
|
| 33 |
} |
|
| 34 |
|
|
| 35 |
private string _Project_NOAndProject_Name; |
|
| 36 |
public string Project_NOAndProject_Name |
|
| 37 |
{
|
|
| 38 |
get |
|
| 39 |
{
|
|
| 40 |
return _Project_NOAndProject_Name; |
|
| 41 |
} |
|
| 42 |
set |
|
| 43 |
{
|
|
| 44 |
if (_Project_NOAndProject_Name != value) |
|
| 45 |
{
|
|
| 46 |
_Project_NOAndProject_Name = value; |
|
| 47 |
OnPropertyChanged("Project_NOAndProject_Name");
|
|
| 48 |
} |
|
| 49 |
} |
|
| 50 |
} |
|
| 51 |
|
|
| 52 |
private string _Project_NO; |
|
| 53 |
public string Project_NO |
|
| 54 |
{
|
|
| 55 |
get |
|
| 56 |
{
|
|
| 57 |
return _Project_NO; |
|
| 58 |
} |
|
| 59 |
set |
|
| 60 |
{
|
|
| 61 |
if (_Project_NO != value) |
|
| 62 |
{
|
|
| 63 |
_Project_NO = value; |
|
| 64 |
OnPropertyChanged("Project_NO");
|
|
| 65 |
} |
|
| 66 |
} |
|
| 67 |
} |
|
| 68 |
|
|
| 69 |
private string _Project_Name; |
|
| 70 |
public string Project_Name |
|
| 71 |
{
|
|
| 72 |
get |
|
| 73 |
{
|
|
| 74 |
return _Project_Name; |
|
| 75 |
} |
|
| 76 |
set |
|
| 77 |
{
|
|
| 78 |
if (_Project_Name != value) |
|
| 79 |
{
|
|
| 80 |
_Project_Name = value; |
|
| 81 |
OnPropertyChanged("Project_Name");
|
|
| 82 |
} |
|
| 83 |
} |
|
| 84 |
} |
|
| 85 |
} |
|
| 86 |
} |
|
| ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj | ||
|---|---|---|
| 180 | 180 |
<Compile Include="Data\FinalPDF.cs" /> |
| 181 | 181 |
<Compile Include="Data\FinalPDFCOUNT.cs" /> |
| 182 | 182 |
<Compile Include="Data\MenuItem.cs" /> |
| 183 |
<Compile Include="Data\ProjectName.cs" /> |
|
| 183 | 184 |
<Compile Include="Data\SelectedCountItem.cs" /> |
| 184 | 185 |
<Compile Include="Data\StatusViewItem.cs" /> |
| 185 | 186 |
<Compile Include="Data\ViewInfo.cs" /> |
| ... | ... | |
| 216 | 217 |
<Compile Include="SELECT_FINAL_PDF_Result.cs"> |
| 217 | 218 |
<DependentUpon>MarkusModel.tt</DependentUpon> |
| 218 | 219 |
</Compile> |
| 220 |
<Compile Include="SELECT_RUN_PROJECTS_Result.cs"> |
|
| 221 |
<DependentUpon>MarkusModel.tt</DependentUpon> |
|
| 222 |
</Compile> |
|
| 219 | 223 |
<Compile Include="ViewModel\DashBoardViewModel.cs" /> |
| 220 | 224 |
<Compile Include="ViewModel\FinalPDFViewModel.cs" /> |
| 221 | 225 |
<Compile Include="ViewModel\FinalPDFAddDialogViewModel.cs" /> |
| ConvertService/ServiceBase/Markus.Service.StationController/MarkusModel.Context.cs | ||
|---|---|---|
| 338 | 338 |
|
| 339 | 339 |
return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<SELECT_FINALPDF_COUNT_Result>("markusEntities.SELECT_FINALPDF_COUNT", p_STATUSParameter, p_BEGIN_CREATE_DATETIMEParameter, p_FINISH_CREATE_DATETIMEParameter);
|
| 340 | 340 |
} |
| 341 |
|
|
| 342 |
public virtual ObjectResult<SELECT_RUN_PROJECTS_Result> SELECT_RUN_PROJECTS(Nullable<int> p_RUN_PROJECTS) |
|
| 343 |
{
|
|
| 344 |
var p_RUN_PROJECTSParameter = p_RUN_PROJECTS.HasValue ? |
|
| 345 |
new ObjectParameter("P_RUN_PROJECTS", p_RUN_PROJECTS) :
|
|
| 346 |
new ObjectParameter("P_RUN_PROJECTS", typeof(int));
|
|
| 347 |
|
|
| 348 |
return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<SELECT_RUN_PROJECTS_Result>("markusEntities.SELECT_RUN_PROJECTS", p_RUN_PROJECTSParameter);
|
|
| 349 |
} |
|
| 341 | 350 |
} |
| 342 | 351 |
} |
| ConvertService/ServiceBase/Markus.Service.StationController/MarkusModel.edmx | ||
|---|---|---|
| 81 | 81 |
<Parameter Name="P_STATUS" Type="int" Mode="In" /> |
| 82 | 82 |
<Parameter Name="P_END_DATETIME" Type="datetime" Mode="In" /> |
| 83 | 83 |
</Function> |
| 84 |
<Function Name="SELECT_RUN_PROJECTS" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo"> |
|
| 85 |
<Parameter Name="P_RUN_PROJECTS" Type="int" Mode="In" /> |
|
| 86 |
</Function> |
|
| 84 | 87 |
<EntityContainer Name="markusModelStoreContainer" /> |
| 85 | 88 |
</Schema></edmx:StorageModels> |
| 86 | 89 |
<!-- CSDL content --> |
| ... | ... | |
| 173 | 176 |
<Parameter Name="P_BEGIN_CREATE_DATETIME" Mode="In" Type="DateTime" /> |
| 174 | 177 |
<Parameter Name="P_FINISH_CREATE_DATETIME" Mode="In" Type="DateTime" /> |
| 175 | 178 |
</FunctionImport> |
| 179 |
<FunctionImport Name="SELECT_RUN_PROJECTS" ReturnType="Collection(markusModel.SELECT_RUN_PROJECTS_Result)"> |
|
| 180 |
<Parameter Name="P_RUN_PROJECTS" Mode="In" Type="Int32" /> |
|
| 181 |
</FunctionImport> |
|
| 176 | 182 |
</EntityContainer> |
| 177 | 183 |
<ComplexType Name="SELECT_CONVERT_ITEM_Result"> |
| 178 | 184 |
<Property Type="String" Name="ID" Nullable="false" MaxLength="50" /> |
| ... | ... | |
| 231 | 237 |
<Property Type="Int32" Name="COUNT" Nullable="false" /> |
| 232 | 238 |
<Property Type="Int32" Name="EXCEPTION_COUNT" Nullable="false" /> |
| 233 | 239 |
</ComplexType> |
| 240 |
<ComplexType Name="SELECT_RUN_PROJECTS_Result"> |
|
| 241 |
<Property Type="String" Name="PROJECT_NO" Nullable="false" MaxLength="10" /> |
|
| 242 |
<Property Type="String" Name="PROJECT_NAME" Nullable="false" MaxLength="50" /> |
|
| 243 |
</ComplexType> |
|
| 234 | 244 |
</Schema> |
| 235 | 245 |
</edmx:ConceptualModels> |
| 236 | 246 |
<!-- C-S mapping content --> |
| ... | ... | |
| 288 | 298 |
<ComplexTypeMapping TypeName="markusModel.SELECT_FINALPDF_COUNT_Result" /> |
| 289 | 299 |
</ResultMapping> |
| 290 | 300 |
</FunctionImportMapping> |
| 301 |
<FunctionImportMapping FunctionImportName="SELECT_RUN_PROJECTS" FunctionName="markusModel.Store.SELECT_RUN_PROJECTS"> |
|
| 302 |
<ResultMapping> |
|
| 303 |
<ComplexTypeMapping TypeName="markusModel.SELECT_RUN_PROJECTS_Result"> |
|
| 304 |
<ScalarProperty Name="PROJECT_NO" ColumnName="PROJECT_NO" /> |
|
| 305 |
<ScalarProperty Name="PROJECT_NAME" ColumnName="PROJECT_NAME" /> |
|
| 306 |
</ComplexTypeMapping> |
|
| 307 |
</ResultMapping> |
|
| 308 |
</FunctionImportMapping> |
|
| 291 | 309 |
</EntityContainerMapping> |
| 292 | 310 |
</Mapping> |
| 293 | 311 |
</edmx:Mappings> |
| ConvertService/ServiceBase/Markus.Service.StationController/SELECT_RUN_PROJECTS_Result.cs | ||
|---|---|---|
| 1 |
//------------------------------------------------------------------------------ |
|
| 2 |
// <auto-generated> |
|
| 3 |
// 이 코드는 템플릿에서 생성되었습니다. |
|
| 4 |
// |
|
| 5 |
// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. |
|
| 6 |
// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. |
|
| 7 |
// </auto-generated> |
|
| 8 |
//------------------------------------------------------------------------------ |
|
| 9 |
|
|
| 10 |
namespace Markus.Service.StationController |
|
| 11 |
{
|
|
| 12 |
using System; |
|
| 13 |
|
|
| 14 |
public partial class SELECT_RUN_PROJECTS_Result |
|
| 15 |
{
|
|
| 16 |
public string PROJECT_NO { get; set; }
|
|
| 17 |
public string PROJECT_NAME { get; set; }
|
|
| 18 |
} |
|
| 19 |
} |
|
| ConvertService/ServiceBase/Markus.Service.StationController/StationController.ini | ||
|---|---|---|
| 15 | 15 |
|
| 16 | 16 |
|
| 17 | 17 |
#효성 복사본 |
| 18 |
#MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q=
|
|
| 18 |
MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q= |
|
| 19 | 19 |
|
| 20 | 20 |
#Doftech 개발 |
| 21 |
MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w== |
|
| 21 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
|
|
| 22 | 22 |
|
| 23 | 23 |
# remote test MARKUS_V3 |
| 24 | 24 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w== |
| ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
|---|---|---|
| 54 | 54 |
|
| 55 | 55 |
#region Properties |
| 56 | 56 |
|
| 57 |
public ObservableCollection<ProjectName> _ProjectNames; |
|
| 58 |
public ObservableCollection<ProjectName> ProjectNames |
|
| 59 |
{
|
|
| 60 |
get |
|
| 61 |
{
|
|
| 62 |
if (_ProjectNames == null) |
|
| 63 |
{
|
|
| 64 |
_ProjectNames = new System.Collections.ObjectModel.ObservableCollection<ProjectName>(); |
|
| 65 |
} |
|
| 66 |
|
|
| 67 |
return _ProjectNames; |
|
| 68 |
} |
|
| 69 |
set |
|
| 70 |
{
|
|
| 71 |
_ProjectNames = value; |
|
| 72 |
OnPropertyChanged(() => ProjectNames); |
|
| 73 |
} |
|
| 74 |
} |
|
| 75 |
|
|
| 57 | 76 |
private System.Collections.ObjectModel.ObservableCollection<ConvertPDF> _FilterSearch; |
| 58 | 77 |
public System.Collections.ObjectModel.ObservableCollection<ConvertPDF> FilterSearch |
| 59 | 78 |
{
|
| ... | ... | |
| 278 | 297 |
} |
| 279 | 298 |
} |
| 280 | 299 |
|
| 281 |
public string _ProjectNumberFilter;
|
|
| 282 |
public string ProjectNumberFilter
|
|
| 300 |
public ProjectName _ProjectNumberFilter;
|
|
| 301 |
public ProjectName ProjectNumberFilter
|
|
| 283 | 302 |
{
|
| 284 |
get { return _ProjectNumberFilter; }
|
|
| 285 |
set |
|
| 303 |
get |
|
| 286 | 304 |
{
|
| 287 |
if (_ProjectNumberFilter == "") |
|
| 288 |
{
|
|
| 289 |
_ProjectNumberFilter = null; |
|
| 290 |
} |
|
| 291 |
else if (_ProjectNumberFilter != value) |
|
| 305 |
if (_ProjectNumberFilter == null) |
|
| 292 | 306 |
{
|
| 293 |
_ProjectNumberFilter = value; |
|
| 294 |
OnPropertyChanged(() => ProjectNumberFilter); |
|
| 307 |
_ProjectNumberFilter = new ProjectName(); |
|
| 295 | 308 |
} |
| 309 |
return _ProjectNumberFilter; |
|
| 310 |
} |
|
| 311 |
set |
|
| 312 |
{
|
|
| 313 |
_ProjectNumberFilter = value; |
|
| 314 |
OnPropertyChanged(() => ProjectNumberFilter); |
|
| 296 | 315 |
} |
| 297 | 316 |
} |
| 298 | 317 |
|
| ... | ... | |
| 555 | 574 |
}); |
| 556 | 575 |
} |
| 557 | 576 |
|
| 558 |
//await Task.Delay(5000);
|
|
| 559 |
await Task.Delay(10000); |
|
| 577 |
await Task.Delay(5000); |
|
| 578 |
//await Task.Delay(10000);
|
|
| 560 | 579 |
|
| 561 | 580 |
//System.Threading.Thread.Sleep(new TimeSpan(0,0,0,0,100)); |
| 562 | 581 |
|
| ... | ... | |
| 579 | 598 |
}); |
| 580 | 599 |
} |
| 581 | 600 |
|
| 582 |
//await Task.Delay(5000);
|
|
| 583 |
await Task.Delay(10000); |
|
| 601 |
await Task.Delay(5000); |
|
| 602 |
//await Task.Delay(10000);
|
|
| 584 | 603 |
|
| 585 | 604 |
//System.Threading.Thread.Sleep(new TimeSpan(0,0,0,0,100)); |
| 586 | 605 |
|
| ... | ... | |
| 626 | 645 |
DataSelect(new[] { (StatusCodeType)(SelectedStatus.Value) }, FilterConvertSource);
|
| 627 | 646 |
} |
| 628 | 647 |
|
| 648 |
|
|
| 629 | 649 |
/// 컨버터중인 items |
| 630 | 650 |
RealDataSelect(new[] { StatusCodeType.None, StatusCodeType.Wait, StatusCodeType.PageLoading, StatusCodeType.Saving }, RealConvertSource);
|
| 631 | 651 |
|
| ... | ... | |
| 641 | 661 |
|
| 642 | 662 |
foreach (var coll in collection) |
| 643 | 663 |
{
|
| 644 |
var items = entities.SELECT_CONVERT_ITEM(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null,null).ToList(); |
|
| 664 |
var items = entities.SELECT_CONVERT_ITEM(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null).ToList();
|
|
| 645 | 665 |
|
| 646 | 666 |
foreach (var x in items) |
| 647 | 667 |
{
|
| ... | ... | |
| 650 | 670 |
ConvertPDF AddItem = new ConvertPDF(x.SERVICE_ID, x.ID, x.PROJECT_NO, x.STATUS, x.DOCUMENT_ID, x.DOCUMENT_NAME, x.DOCUMENT_NO, x.DOCUMENT_URL, x.REVISION, x.CURRENT_PAGE, |
| 651 | 671 |
x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.DOCUMENT_URL, x.CONVERT_PATH, MarkusLink, x.RECONVERTER); |
| 652 | 672 |
Listitems.Add(AddItem); |
| 653 |
|
|
| 673 |
|
|
| 654 | 674 |
} |
| 655 | 675 |
} |
| 656 | 676 |
|
| ... | ... | |
| 681 | 701 |
_status = (int)SelectedStatus.Value; |
| 682 | 702 |
} |
| 683 | 703 |
|
| 684 |
var items = entities.SELECT_CONVERT_ITEM(null, null, null, _status, SelectedCount.ValueMember, null, null, null, |
|
| 685 |
null, null, null, null, null, null, null, null, null, null).ToList(); |
|
| 686 |
|
|
| 687 |
List<ConvertPDF> Listitems = new List<ConvertPDF>(); |
|
| 688 |
|
|
| 689 |
foreach (var x in items) |
|
| 704 |
if (ProjectNames.Count() == 0) |
|
| 690 | 705 |
{
|
| 691 |
var MarkusLink = "kcom://" + CreateMarkusParam(x.PROJECT_NO, x.DOCUMENT_ID, "doftech"); |
|
| 692 |
|
|
| 693 |
ConvertPDF AddItem = new ConvertPDF(x.SERVICE_ID, x.ID, x.PROJECT_NO, x.STATUS, x.DOCUMENT_ID, x.DOCUMENT_NAME, x.DOCUMENT_NO, x.DOCUMENT_URL, x.REVISION, x.CURRENT_PAGE, |
|
| 694 |
x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.DOCUMENT_URL, x.CONVERT_PATH, MarkusLink, x.RECONVERTER); |
|
| 695 |
Listitems.Add(AddItem); |
|
| 696 |
|
|
| 706 |
foreach (var x in entities.SELECT_RUN_PROJECTS(0)) |
|
| 707 |
{
|
|
| 708 |
ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME); |
|
| 709 |
ProjectNames.Add(projectName); |
|
| 710 |
} |
|
| 697 | 711 |
} |
| 698 | 712 |
|
| 713 |
var Listitems = from num in entities.SELECT_CONVERT_ITEM(null, null, null, _status, SelectedCount.ValueMember, null, null, null, null, null, null, null, null, null, null, null, null, null).ToList() |
|
| 714 |
let MarkusLink = "kcom://" + CreateMarkusParam(num.PROJECT_NO, num.DOCUMENT_ID, "doftech") |
|
| 715 |
select new ConvertPDF(num.SERVICE_ID, num.ID, num.PROJECT_NO, num.STATUS, num.DOCUMENT_ID, num.DOCUMENT_NAME, num.DOCUMENT_NO, num.DOCUMENT_URL, num.REVISION, num.CURRENT_PAGE, |
|
| 716 |
num.TOTAL_PAGE, num.EXCEPTION, num.GROUP_NO, num.CREATE_DATETIME, num.START_DATETIME, num.END_DATETIME, num.DOCUMENT_URL, num.CONVERT_PATH, MarkusLink, num.RECONVERTER); |
|
| 717 |
|
|
| 699 | 718 |
if (collection.Count() == 0) |
| 700 | 719 |
{
|
| 701 | 720 |
if (statusCodeTypeList.Count() == 1) |
| 702 | 721 |
{
|
| 703 |
Listitems.ForEach(x => collection.Add(x)); |
|
| 722 |
//Listitems.ForEach(x => collection.Add(x)); |
|
| 723 |
foreach(var Listitem in Listitems.ToList()) |
|
| 724 |
{
|
|
| 725 |
collection.Add(Listitem); |
|
| 726 |
} |
|
| 704 | 727 |
} |
| 705 | 728 |
} |
| 706 | 729 |
else |
| 707 | 730 |
{
|
| 708 | 731 |
|
| 709 | 732 |
////세미 업데이트 |
| 710 |
Listitems.ForEach(newitem => |
|
| 733 |
//Listitems.ForEach(newitem => |
|
| 734 |
//{
|
|
| 735 |
// collection.UpdateWhere(changeitem => |
|
| 736 |
// ConvertItemEx.ChangeValues(changeitem, newitem), x => x.ProjectNumber == newitem.ProjectNumber && x.ConvertID == newitem.ConvertID); |
|
| 737 |
//}); |
|
| 738 |
foreach (var Listitem in Listitems) |
|
| 711 | 739 |
{
|
| 712 | 740 |
collection.UpdateWhere(changeitem => |
| 713 |
ConvertItemEx.ChangeValues(changeitem, newitem), x => x.ProjectNumber == newitem.ProjectNumber && x.ConvertID == newitem.ConvertID); |
|
| 714 |
}); |
|
| 715 |
|
|
| 741 |
ConvertItemEx.ChangeValues(changeitem, Listitem), x => x.ProjectNumber == Listitem.ProjectNumber && x.ConvertID == Listitem.ConvertID); |
|
| 742 |
} |
|
| 716 | 743 |
if (statusCodeTypeList.Count() == 1) |
| 717 | 744 |
{
|
| 718 | 745 |
//삭제 |
| ... | ... | |
| 783 | 810 |
//DocumentID = unikey |
| 784 | 811 |
DateTime? Start_CreateTime = null; |
| 785 | 812 |
DateTime? Finish_CreateTime = null; |
| 786 |
if(SelectedCreateTimeBegin != DefaultCreateTime) |
|
| 813 |
if (SelectedCreateTimeBegin != DefaultCreateTime)
|
|
| 787 | 814 |
{
|
| 788 | 815 |
Start_CreateTime = SelectedCreateTimeBegin; |
| 789 | 816 |
} |
| 790 |
if(SelectedCreateTimeEnd != DefaultCreateTime) |
|
| 817 |
if (SelectedCreateTimeEnd != DefaultCreateTime)
|
|
| 791 | 818 |
{
|
| 792 | 819 |
Finish_CreateTime = SelectedCreateTimeEnd; |
| 793 | 820 |
} |
| 794 | 821 |
|
| 795 |
var items = entities.SELECT_CONVERT_ITEM(null, ProjectNumberFilter, UniqueKeyFilter, _status, SelectedCount.ValueMember, Start_CreateTime, Finish_CreateTime, null, |
|
| 796 |
null, null, null, GroupNOFilter, Document_NameFilter, Docuemnt_NOFilter, RevisionFilter, Service_IDFilter, ReconverterFilter, DOCUMENT_URLFilter).ToList(); |
|
| 797 |
|
|
| 798 |
List<ConvertPDF> Listitems = new List<ConvertPDF>(); |
|
| 799 |
|
|
| 800 |
foreach (var x in items) |
|
| 822 |
if (ProjectNames.Count() == 0) |
|
| 801 | 823 |
{
|
| 802 |
var MarkusLink = "kcom://" + CreateMarkusParam(x.PROJECT_NO, x.DOCUMENT_ID, "doftech"); |
|
| 803 |
|
|
| 804 |
ConvertPDF AddItem = new ConvertPDF(x.SERVICE_ID, x.ID, x.PROJECT_NO, x.STATUS, x.DOCUMENT_ID, x.DOCUMENT_NAME, x.DOCUMENT_NO, x.DOCUMENT_URL, x.REVISION, x.CURRENT_PAGE, |
|
| 805 |
x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.DOCUMENT_URL, x.CONVERT_PATH, MarkusLink, x.RECONVERTER); |
|
| 806 |
Listitems.Add(AddItem); |
|
| 807 |
|
|
| 824 |
foreach (var x in entities.SELECT_RUN_PROJECTS(0)) |
|
| 825 |
{
|
|
| 826 |
ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME); |
|
| 827 |
ProjectNames.Add(projectName); |
|
| 828 |
} |
|
| 808 | 829 |
} |
| 809 | 830 |
|
| 831 |
var Listitems = from num in entities.SELECT_CONVERT_ITEM(null, ProjectNumberFilter.Project_NO, UniqueKeyFilter, _status, SelectedCount.ValueMember, Start_CreateTime, Finish_CreateTime, null, |
|
| 832 |
null, null, null, GroupNOFilter, Document_NameFilter, Docuemnt_NOFilter, RevisionFilter, Service_IDFilter, ReconverterFilter, DOCUMENT_URLFilter).ToList() |
|
| 833 |
let MarkusLink = "kcom://" + CreateMarkusParam(num.PROJECT_NO, num.DOCUMENT_ID, "doftech") |
|
| 834 |
select new ConvertPDF(num.SERVICE_ID, num.ID, num.PROJECT_NO, num.STATUS, num.DOCUMENT_ID, num.DOCUMENT_NAME, num.DOCUMENT_NO, num.DOCUMENT_URL, num.REVISION, num.CURRENT_PAGE, |
|
| 835 |
num.TOTAL_PAGE, num.EXCEPTION, num.GROUP_NO, num.CREATE_DATETIME, num.START_DATETIME, num.END_DATETIME, num.DOCUMENT_URL, num.CONVERT_PATH, MarkusLink, num.RECONVERTER); |
|
| 836 |
|
|
| 810 | 837 |
if (collection.Count() == 0) |
| 811 | 838 |
{
|
| 812 | 839 |
if (statusCodeTypeList.Count() == 1) |
| ... | ... | |
| 1138 | 1165 |
var _CREATE_DATETIME = DateTime.Now; |
| 1139 | 1166 |
var _STATUS = (int)StatusCodeType.None; |
| 1140 | 1167 |
|
| 1141 |
entities.SELECT_RERECONVERT_ITEM(_ConvertItem.ConvertID, _RECONVERTER, _CREATE_DATETIME, _STATUS, null);//_END_DATETIME = null 에러 |
|
| 1168 |
entities.SELECT_RERECONVERT_ITEM(_ConvertItem.ConvertID, _RECONVERTER, _CREATE_DATETIME, _STATUS, null);//_END_DATETIME = null 에러
|
|
| 1142 | 1169 |
|
| 1143 | 1170 |
} |
| 1144 | 1171 |
|
| ... | ... | |
| 1364 | 1391 |
|
| 1365 | 1392 |
public void Reset(object obj) |
| 1366 | 1393 |
{
|
| 1367 |
ProjectNumberFilter = null;
|
|
| 1394 |
ProjectNumberFilter= null; |
|
| 1368 | 1395 |
UniqueKeyFilter = null; |
| 1369 | 1396 |
Service_IDFilter = null; |
| 1370 | 1397 |
Document_NameFilter = null; |
| ... | ... | |
| 1378 | 1405 |
SelectedCreateTimeEnd = DefaultCreateTime; |
| 1379 | 1406 |
dispatcherTimer.Tick -= new EventHandler(SearchTimer_Tick); |
| 1380 | 1407 |
dispatcherTimer.Tick += new EventHandler(Timer_Tick); |
| 1408 |
ProjectNames.Clear(); |
|
| 1409 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString)) |
|
| 1410 |
{
|
|
| 1411 |
foreach (var x in entities.SELECT_RUN_PROJECTS(0)) |
|
| 1412 |
{
|
|
| 1413 |
ProjectName projectName = new ProjectName(x.PROJECT_NO, x.PROJECT_NAME); |
|
| 1414 |
ProjectNames.Add(projectName); |
|
| 1415 |
} |
|
| 1416 |
} |
|
| 1381 | 1417 |
} |
| 1382 | 1418 |
|
| 1383 | 1419 |
#endregion |
| ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
|---|---|---|
| 9 | 9 |
xmlns:Data="clr-namespace:Markus.Service.StationController.Data" |
| 10 | 10 |
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" |
| 11 | 11 |
xmlns:local="clr-namespace:Markus.Service.StationController.Views" x:Class="Markus.Service.StationController.Views.DataBaseView" |
| 12 |
mc:Ignorable="d" Background="White" DataContext="{DynamicResource DataBaseItemsModel}"
|
|
| 13 |
d:DesignHeight="450" d:DesignWidth="1000"> |
|
| 12 |
mc:Ignorable="d" Background="White" DataContext="{DynamicResource DataBaseItemsModel}" d:DesignHeight="450" d:DesignWidth="1000">
|
|
| 14 | 13 |
<UserControl.Resources> |
| 15 | 14 |
<Style TargetType="telerik:GridViewCell" x:Key="StretchCellStyle"> |
| 16 | 15 |
<Setter Property="Margin" Value="0"/> |
| ... | ... | |
| 32 | 31 |
<Setter Property="Margin" Value="5,5,0,0"/> |
| 33 | 32 |
<Setter Property="VerticalAlignment" Value="Center"/> |
| 34 | 33 |
<Setter Property="VerticalContentAlignment" Value="Center"/> |
| 35 |
<Setter Property="HorizontalContentAlignment" Value="Left"/> |
|
| 34 |
<Setter Property="HorizontalContentAlignment" Value="Stretch"/> |
|
| 35 |
<Setter Property="HorizontalAlignment" Value="Stretch"/> |
|
| 36 | 36 |
<Setter Property="Foreground" Value="Black"/> |
| 37 | 37 |
<Setter Property="Background" Value="Transparent"/> |
| 38 | 38 |
<Setter Property="BorderBrush" Value="Transparent"/> |
| ... | ... | |
| 41 | 41 |
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
| 42 | 42 |
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/> |
| 43 | 43 |
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/> |
| 44 |
<Setter Property="TextBlock.HorizontalAlignment" Value="Stretch"/> |
|
| 44 | 45 |
<Setter Property="Template"> |
| 45 | 46 |
<Setter.Value> |
| 46 |
<ControlTemplate TargetType="{x:Type TextBox}">
|
|
| 47 |
<ControlTemplate TargetType="{x:Type TextBox}" >
|
|
| 47 | 48 |
<Border x:Name="Bd" |
| 48 | 49 |
BorderThickness="{TemplateBinding BorderThickness}"
|
| 49 | 50 |
SnapsToDevicePixels="true"> |
| 50 |
<ScrollViewer x:Name="PART_ContentHost" BorderThickness="{TemplateBinding BorderThickness}"
|
|
| 51 |
<ScrollViewer x:Name="PART_ContentHost" BorderThickness="{TemplateBinding BorderThickness}"
|
|
| 51 | 52 |
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
|
| 52 | 53 |
</Border> |
| 53 | 54 |
</ControlTemplate> |
| 54 | 55 |
</Setter.Value> |
| 55 | 56 |
</Setter> |
| 56 | 57 |
</Style> |
| 57 |
<DataTemplate x:Key="borderedTemplate"> |
|
| 58 |
<Border BorderBrush="Transparent" BorderThickness="0" Background="Transparent" > |
|
| 59 |
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" > |
|
| 60 |
</TextBlock> |
|
| 58 |
<!--<Style x:Key="MyFocusVisual"> |
|
| 59 |
<Setter Property="Control.Template" Value="{x:Null}"/>
|
|
| 60 |
</Style>--> |
|
| 61 |
<!--<DataTemplate x:Key="borderedTemplate"> |
|
| 62 |
<Border BorderBrush="Transparent" BorderThickness="0" Background="White" SnapsToDevicePixels="true"> |
|
| 63 |
<TextBox VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Black" IsReadOnly="True" ScrollViewer.PanningMode="VerticalFirst" Stylus.IsFlicksEnabled="False" |
|
| 64 |
SnapsToDevicePixels="True" HorizontalContentAlignment="Left" VerticalContentAlignment="Center" FocusVisualStyle="{DynamicResource MyFocusVisual}"
|
|
| 65 |
Background="White" BorderBrush="Transparent" BorderThickness="0"> |
|
| 66 |
</TextBox> |
|
| 61 | 67 |
</Border> |
| 62 |
</DataTemplate> |
|
| 68 |
</DataTemplate>--> |
|
| 69 |
|
|
| 63 | 70 |
<VM:DataBaseItemsModel x:Key="DataBaseItemsModel"/> |
| 64 | 71 |
<DataTemplate x:Key="RowDetailsTemplate"> |
| 65 | 72 |
<local:DataBaseViewInfo /> |
| ... | ... | |
| 179 | 186 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
| 180 | 187 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" >
|
| 181 | 188 |
</telerik:GridViewDataColumn>--> |
| 182 |
<telerik:GridViewDataColumn Header=" ConvertPath" IsReadOnly="True" Width="2.5*" Style="{Binding Mode=OneWay, Source={StaticResource borderedTemplate}}">
|
|
| 189 |
<telerik:GridViewDataColumn Header=" ConvertPath" IsReadOnly="True" Width="2.5*"> |
|
| 190 |
<!--Style="{Binding Mode=OneWay, Source={StaticResource borderedTemplate}}"-->
|
|
| 183 | 191 |
<telerik:GridViewDataColumn.CellTemplate> |
| 184 |
<DataTemplate > |
|
| 185 |
<StackPanel Orientation="Horizontal"> |
|
| 186 |
<TextBox Text="{Binding ConvertPath}" Background="Transparent" BorderThickness="0" IsReadOnly="True" Foreground="Black" />
|
|
| 187 |
<telerik:RadButton BorderThickness="0" |
|
| 188 |
Background="Transparent" |
|
| 192 |
<DataTemplate> |
|
| 193 |
<StackPanel Orientation="Horizontal" > |
|
| 194 |
<TextBox Text="{Binding ConvertPath}" Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black"/>
|
|
| 195 |
<telerik:RadButton Background="Transparent" BorderBrush="Transparent" BorderThickness="0" Foreground="Black" |
|
| 189 | 196 |
Command="{Binding ConvertPathFileSearchCommand, Source={StaticResource DataBaseItemsModel}}" CommandParameter="{Binding DataContext, RelativeSource={RelativeSource Self}}">
|
| 190 | 197 |
<Image Source="E:\Source\MARKUS\ConvertService\ServiceBase\Markus.Service.StationController\Picture\File_Search_Icon.png" Stretch="None" /> |
| 191 | 198 |
</telerik:RadButton> |
| ... | ... | |
| 194 | 201 |
</telerik:GridViewDataColumn.CellTemplate> |
| 195 | 202 |
</telerik:GridViewDataColumn> |
| 196 | 203 |
|
| 197 |
<telerik:GridViewDataColumn Header="CreateTime" Background="Transparent" IsReadOnly="True"
|
|
| 204 |
<telerik:GridViewDataColumn Header="CreateTime" IsReadOnly="True" Background="Transparent"
|
|
| 198 | 205 |
DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 199 |
<telerik:GridViewDataColumn Header="StartTime" Background="Transparent" IsReadOnly="True"
|
|
| 206 |
<telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True" Background="Transparent"
|
|
| 200 | 207 |
DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 201 |
<telerik:GridViewDataColumn Header="EndTime" Background="Transparent" IsReadOnly="True"
|
|
| 208 |
<telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True" Background="Transparent"
|
|
| 202 | 209 |
DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 203 | 210 |
</telerik:RadGridView.Columns> |
| 204 | 211 |
</telerik:RadGridView> |
| ... | ... | |
| 270 | 277 |
</telerik:GridViewDynamicHyperlinkColumn> |
| 271 | 278 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
| 272 | 279 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" />-->
|
| 273 |
<telerik:GridViewDataColumn Header=" ConvertPath" Width="2.5*" Style="{Binding Mode=OneWay, Source={StaticResource borderedTemplate}}">
|
|
| 280 |
<telerik:GridViewDataColumn Header=" ConvertPath" Width="2.5*"> |
|
| 274 | 281 |
<telerik:GridViewDataColumn.CellTemplate> |
| 275 | 282 |
<DataTemplate > |
| 276 | 283 |
<StackPanel Orientation="Horizontal"> |
| ... | ... | |
| 284 | 291 |
</DataTemplate> |
| 285 | 292 |
</telerik:GridViewDataColumn.CellTemplate> |
| 286 | 293 |
</telerik:GridViewDataColumn> |
| 287 |
<telerik:GridViewDataColumn Header="CreateTime" |
|
| 294 |
<telerik:GridViewDataColumn Header="CreateTime" IsReadOnly="True"
|
|
| 288 | 295 |
DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 289 |
<telerik:GridViewDataColumn Header="StartTime" |
|
| 296 |
<telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"
|
|
| 290 | 297 |
DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 291 |
<telerik:GridViewDataColumn Header="EndTime" |
|
| 298 |
<telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"
|
|
| 292 | 299 |
DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 293 | 300 |
</telerik:RadGridView.Columns> |
| 294 | 301 |
</telerik:RadGridView> |
| ... | ... | |
| 350 | 357 |
</telerik:GridViewDynamicHyperlinkColumn> |
| 351 | 358 |
<!--<telerik:GridViewDataColumn Header=" ConvertPath" |
| 352 | 359 |
DataMemberBinding="{Binding ConvertPath}" Width="2.5*" />-->
|
| 353 |
<telerik:GridViewDataColumn Header=" ConvertPath" Width="2.5*" Style="{Binding Mode=OneWay, Source={StaticResource borderedTemplate}}">
|
|
| 360 |
<telerik:GridViewDataColumn Header=" ConvertPath" Width="2.5*"> |
|
| 354 | 361 |
<telerik:GridViewDataColumn.CellTemplate> |
| 355 | 362 |
<DataTemplate > |
| 356 | 363 |
<StackPanel Orientation="Horizontal"> |
| ... | ... | |
| 364 | 371 |
</DataTemplate> |
| 365 | 372 |
</telerik:GridViewDataColumn.CellTemplate> |
| 366 | 373 |
</telerik:GridViewDataColumn> |
| 367 |
<telerik:GridViewDataColumn Header="CreateTime" |
|
| 374 |
<telerik:GridViewDataColumn Header="CreateTime" IsReadOnly="True"
|
|
| 368 | 375 |
DataMemberBinding="{Binding CreateTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 369 |
<telerik:GridViewDataColumn Header="StartTime" |
|
| 376 |
<telerik:GridViewDataColumn Header="StartTime" IsReadOnly="True"
|
|
| 370 | 377 |
DataMemberBinding="{Binding StartTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 371 |
<telerik:GridViewDataColumn Header="EndTime" |
|
| 378 |
<telerik:GridViewDataColumn Header="EndTime" IsReadOnly="True"
|
|
| 372 | 379 |
DataMemberBinding="{Binding EndTime, Mode=TwoWay, StringFormat=\{0:yyyy.MM.dd HH:mm:ss\}}" Width="*" />
|
| 373 | 380 |
</telerik:RadGridView.Columns> |
| 374 | 381 |
</telerik:RadGridView> |
내보내기 Unified diff
