개정판 ee910e7f
Convert_DOC완료 Search -> MaxTextLength 변경 & 테스트 완료
Change-Id: Ide50406912800acbaecc08653a366eb50d8b9640
ConvertService/ServiceBase/Markus.Service.StationController/Controls/DatabaseFilter.xaml | ||
---|---|---|
6 | 6 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
7 | 7 |
xmlns:local="clr-namespace:Markus.Service.StationController.Views" |
8 | 8 |
xmlns:VM="clr-namespace:Markus.Service.StationController.ViewModel" |
9 |
xmlns:maskedInput="clr-namespace:Telerik.Windows.Controls.MaskedInput;assembly=Telerik.Windows.Controls.Input" |
|
9 | 10 |
d:DesignHeight="300" d:DesignWidth="1000" |
10 | 11 |
mc:Ignorable="d" > |
11 | 12 |
<Grid> |
... | ... | |
37 | 38 |
<ColumnDefinition Width="Auto"/> |
38 | 39 |
<ColumnDefinition Width="*"/> |
39 | 40 |
</Grid.ColumnDefinitions> |
41 |
|
|
40 | 42 |
<TextBlock Text="ProjectNumber " Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
41 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" Grid.Row="0" Grid.Column="1" |
|
42 |
EmptyContent="ProjectNumber" InputBehavior="Replace" HorizontalContentAlignment="Stretch" |
|
43 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" Grid.Row="0" Grid.Column="1" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
44 |
EmptyContent="ProjectNumber" InputBehavior="Replace" HorizontalContentAlignment="Stretch" Mask=""
|
|
43 | 45 |
TextMode="PlainText" Value="{Binding ProjectNo,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay, ElementName=userControl}" |
44 | 46 |
VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0" /> |
45 | 47 |
|
46 | 48 |
<TextBlock Text="UniqueKey " Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
47 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
49 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
48 | 50 |
EmptyContent="UniqueKey" Value="{Binding UniqueKeyFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
49 |
TextMode="PlainText" Grid.Row="0" Grid.Column="4" |
|
51 |
TextMode="PlainText" Grid.Row="0" Grid.Column="4" Mask=""
|
|
50 | 52 |
HorizontalAlignment="Stretch" |
51 | 53 |
VerticalAlignment="Center" Margin="2,0"/> |
52 | 54 |
|
53 | 55 |
<TextBlock Text="Service ID " Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
54 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
56 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
55 | 57 |
EmptyContent="Service ID" Value="{Binding Service_IDFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
56 |
TextMode="PlainText" Grid.Row="0" Grid.Column="7" |
|
58 |
TextMode="PlainText" Grid.Row="0" Grid.Column="7" Mask=""
|
|
57 | 59 |
HorizontalAlignment="Stretch" |
58 | 60 |
VerticalAlignment="Center" Margin="2,0"/> |
59 | 61 |
|
60 | 62 |
<TextBlock Text="Revision " Grid.Row="0" Grid.Column="9" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
61 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
63 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
62 | 64 |
EmptyContent="Revision" Value="{Binding RevisionFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
63 |
TextMode="PlainText" Grid.Row="0" Grid.Column="10" |
|
65 |
TextMode="PlainText" Grid.Row="0" Grid.Column="10" Mask=""
|
|
64 | 66 |
HorizontalContentAlignment="Stretch" |
65 | 67 |
VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0"/> |
66 | 68 |
|
67 | 69 |
<TextBlock Text="Docuemnt Name " Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
68 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
70 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
69 | 71 |
EmptyContent="Docuemnt Name" Value="{Binding Document_NameFilter , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
70 |
TextMode="PlainText" Grid.Row="1" Grid.Column="1" |
|
72 |
TextMode="PlainText" Grid.Row="1" Grid.Column="1" Mask=""
|
|
71 | 73 |
HorizontalContentAlignment="Stretch" |
72 | 74 |
VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="2,0"/> |
73 | 75 |
|
74 | 76 |
<TextBlock Text="Docuemnt NO " Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
75 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
77 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
76 | 78 |
EmptyContent="Docuemnt NO" Value="{Binding Docuemnt_NOFilter , UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
77 |
TextMode="PlainText" Grid.Row="1" Grid.Column="4" |
|
79 |
TextMode="PlainText" Grid.Row="1" Grid.Column="4" Mask=""
|
|
78 | 80 |
HorizontalAlignment="Stretch" |
79 | 81 |
VerticalAlignment="Center" Margin="2,0"/> |
80 | 82 |
|
81 | 83 |
<TextBlock Text="Reconverter " Grid.Row="1" Grid.Column="6" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
82 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
84 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
83 | 85 |
EmptyContent="Reconverter" Value="{Binding ReconverterFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
84 |
TextMode="PlainText" Grid.Row="1" Grid.Column="7" |
|
86 |
TextMode="PlainText" Grid.Row="1" Grid.Column="7" Mask=""
|
|
85 | 87 |
HorizontalAlignment="Stretch" |
86 | 88 |
VerticalAlignment="Center" Margin="2,0"/> |
87 | 89 |
|
88 | 90 |
<TextBlock Text="Group NO " Grid.Row="1" Grid.Column="9" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
89 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
90 |
EmptyContent="Reconverter" Value="{Binding GroupNOFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
|
|
91 |
TextMode="PlainText" Grid.Row="1" Grid.Column="10" |
|
91 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
92 |
EmptyContent="Group NO" Value="{Binding GroupNOFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
|
|
93 |
TextMode="PlainText" Grid.Row="1" Grid.Column="10" Mask=""
|
|
92 | 94 |
HorizontalAlignment="Stretch" |
93 | 95 |
VerticalAlignment="Center" Margin="2,0"/> |
94 | 96 |
|
95 | 97 |
<TextBlock Text="Document_URL " Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left"/> |
96 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" |
|
98 |
<telerik:RadMaskedTextInput IsClearButtonVisible="True" maskedInput:MaskedInputExtensions.MaxTextLength="1000"
|
|
97 | 99 |
EmptyContent="DOCUMENT_URL" Value="{Binding DOCUMENT_URLFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" |
98 |
TextMode="PlainText" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="11" |
|
100 |
TextMode="PlainText" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="11" Mask=""
|
|
99 | 101 |
HorizontalAlignment="Stretch" |
100 | 102 |
VerticalAlignment="Center" Margin="2,0"/> |
101 | 103 |
</Grid> |
ConvertService/ServiceBase/Markus.Service.StationController/Controls/DatabaseFilter.xaml.cs | ||
---|---|---|
35 | 35 |
public static readonly DependencyProperty CreateTimeBeginProperty = DependencyProperty.Register("CreateTimeBegin", typeof(string), typeof(DatabaseFilter), null); |
36 | 36 |
public static readonly DependencyProperty CreateTimeEndProperty = DependencyProperty.Register("CreateTimeEnd", typeof(string), typeof(DatabaseFilter), null); |
37 | 37 |
public static readonly DependencyProperty GroupNOProperty = DependencyProperty.Register("GroupNO", typeof(string), typeof(DatabaseFilter), null); |
38 |
public static readonly DependencyProperty Document_URLProperty = DependencyProperty.Register("Document_URL", typeof(string), typeof(DatabaseFilter), null); |
|
38 | 39 |
|
39 | 40 |
public string ProjectNo |
40 | 41 |
{ |
... | ... | |
96 | 97 |
{ |
97 | 98 |
get |
98 | 99 |
{ |
99 |
return (string)this.GetValue(ProjectNoProperty);
|
|
100 |
return (string)this.GetValue(Service_IDProperty);
|
|
100 | 101 |
} |
101 | 102 |
set |
102 | 103 |
{ |
103 |
this.SetValue(ProjectNoProperty, value);
|
|
104 |
this.SetValue(Service_IDProperty, value);
|
|
104 | 105 |
} |
105 | 106 |
} |
106 | 107 |
public string Revision |
107 | 108 |
{ |
108 | 109 |
get |
109 | 110 |
{ |
110 |
return (string)this.GetValue(ProjectNoProperty);
|
|
111 |
return (string)this.GetValue(RevisionProperty);
|
|
111 | 112 |
} |
112 | 113 |
set |
113 | 114 |
{ |
114 |
this.SetValue(ProjectNoProperty, value);
|
|
115 |
this.SetValue(RevisionProperty, value);
|
|
115 | 116 |
} |
116 | 117 |
} |
117 | 118 |
public string GroupNO |
... | ... | |
125 | 126 |
this.SetValue(GroupNOProperty, value); |
126 | 127 |
} |
127 | 128 |
} |
129 |
public string Document_URL |
|
130 |
{ |
|
131 |
get |
|
132 |
{ |
|
133 |
return (string)this.GetValue(Document_URLProperty); |
|
134 |
} |
|
135 |
set |
|
136 |
{ |
|
137 |
this.SetValue(Document_URLProperty, value); |
|
138 |
} |
|
139 |
} |
|
128 | 140 |
public DateTime CreateTimeBegin |
129 | 141 |
{ |
130 | 142 |
get |
... | ... | |
147 | 159 |
this.SetValue(ProjectNoProperty, value); |
148 | 160 |
} |
149 | 161 |
} |
150 |
|
|
151 |
private void DatePicker1_SelectionChanged(object sender, SelectionChangedEventArgs e) |
|
152 |
{ |
|
153 |
|
|
154 |
} |
|
155 | 162 |
} |
156 | 163 |
} |
ConvertService/ServiceBase/Markus.Service.StationController/MarkusModel.edmx | ||
---|---|---|
145 | 145 |
<ComplexType Name="SELECT_CONVERT_ITEM_Result"> |
146 | 146 |
<Property Type="String" Name="ID" Nullable="false" MaxLength="50" /> |
147 | 147 |
<Property Type="String" Name="PROJECT_NO" Nullable="false" MaxLength="10" /> |
148 |
<Property Type="String" Name="DOCUMENT_URL" Nullable="false" MaxLength="500" />
|
|
148 |
<Property Type="String" Name="DOCUMENT_URL" Nullable="false" MaxLength="Max" />
|
|
149 | 149 |
<Property Type="String" Name="DOCUMENT_ID" Nullable="false" MaxLength="50" /> |
150 | 150 |
<Property Type="DateTime" Name="CREATE_DATETIME" Nullable="false" Precision="23" /> |
151 | 151 |
<Property Type="Int32" Name="STATUS" Nullable="false" /> |
... | ... | |
154 | 154 |
<Property Type="String" Name="EXCEPTION" Nullable="true" /> |
155 | 155 |
<Property Type="DateTime" Name="END_DATETIME" Nullable="true" Precision="23" /> |
156 | 156 |
<Property Type="DateTime" Name="START_DATETIME" Nullable="true" Precision="23" /> |
157 |
<Property Type="String" Name="SERVICE_ID" Nullable="true" MaxLength="50" />
|
|
157 |
<Property Type="String" Name="SERVICE_ID" Nullable="true" MaxLength="Max" />
|
|
158 | 158 |
<Property Type="Int32" Name="RECONVERTER" Nullable="true" /> |
159 | 159 |
<Property Type="String" Name="REVISION" Nullable="true" MaxLength="50" /> |
160 | 160 |
<Property Type="String" Name="DOCUMENT_NO" Nullable="true" MaxLength="50" /> |
... | ... | |
163 | 163 |
<Property Type="String" Name="RESULT_FILE" Nullable="true" MaxLength="500" /> |
164 | 164 |
<Property Type="String" Name="RESULT" Nullable="true" MaxLength="50" /> |
165 | 165 |
<Property Type="String" Name="PROPERTIES_VALUE" Nullable="false" /> |
166 |
<Property Type="String" Name="CONVERT_PATH" Nullable="false" /> |
|
166 | 167 |
</ComplexType> |
167 | 168 |
<ComplexType Name="SELECT_FINAL_PDF_Result" > |
168 | 169 |
<Property Type="String" Name="ID" Nullable="false" /> |
ConvertService/ServiceBase/Markus.Service.StationController/SELECT_CONVERT_ITEM_Result.cs | ||
---|---|---|
33 | 33 |
public string RESULT_FILE { get; set; } |
34 | 34 |
public string RESULT { get; set; } |
35 | 35 |
public string PROPERTIES_VALUE { get; set; } |
36 |
public string CONVERT_PATH { get; set; } |
|
36 | 37 |
} |
37 | 38 |
} |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
628 | 628 |
|
629 | 629 |
foreach (var x in items) |
630 | 630 |
{ |
631 |
var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
|
|
631 |
var MarkusLink = "kcom://" + CreateMarkusParam(x.PROJECT_NO, x.DOCUMENT_ID, "doftech");
|
|
632 | 632 |
|
633 | 633 |
ConvertItem AddItem = new ConvertItem(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, |
634 |
x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.DOCUMENT_URL, convertpath[0], convertpath[1], x.RECONVERTER);
|
|
634 |
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);
|
|
635 | 635 |
Listitems.Add(AddItem); |
636 | 636 |
|
637 | 637 |
} |
... | ... | |
646 | 646 |
RealConvert_Height = 80 + (10 * collection.Count()); |
647 | 647 |
DataBase_ItemsHeight = 800 - (RealConvert_Height + Alive_Height); |
648 | 648 |
} |
649 |
//using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(App.MarkusDataBaseConnecitonString)) |
|
650 |
//{ |
|
651 |
// var items = database.GetConvertProjects(collection)//x:database객체 y:statusCodeTypeList의값 Count()안에 predicator 조건 만족하면 count개수안에 넣음 |
|
652 |
// .Take(SelectedCount.ValueMember).ToList();// |
|
653 |
|
|
654 |
// items.ForEach(newitem => |
|
655 |
// { |
|
656 |
// collection.UpdateWhere(changeitem => |
|
657 |
// ConvertItemEx.ChangeValues(changeitem, newitem), x => x.ConvertID == newitem.ConvertID && x.ProjectNumber == newitem.ProjectNumber); |
|
658 |
// }); |
|
659 |
|
|
660 |
// RealConvert_Height = 80 + (10 * collection.Count()); |
|
661 |
// DataBase_ItemsHeight = 800 - (RealConvert_Height + Alive_Height); |
|
662 |
//} |
|
663 | 649 |
} |
664 | 650 |
catch (Exception ex) |
665 | 651 |
{ |
... | ... | |
682 | 668 |
|
683 | 669 |
var items = entities.SELECT_CONVERT_ITEM(null, null, null, _status, SelectedCount.ValueMember, null, null, null, |
684 | 670 |
null, null, null, null, null, null, null, null, null, null).ToList(); |
685 |
//var items = database.GetConvertProjects(_status, ProjectNumberFilter, UniqueKeyFilter, Document_NameFilter, Service_IDFilter, Docuemnt_NOFilter |
|
686 |
// , ReconverterFilter, RevisionFilter)//x:database객체 y:statusCodeTypeList의값 Count()안에 predicator 조건 만족하면 count개수안에 넣음 |
|
687 |
// .Take(SelectedCount.ValueMember).ToList(); |
|
688 | 671 |
|
689 | 672 |
List<ConvertItem> Listitems = new List<ConvertItem>(); |
690 | 673 |
|
691 | 674 |
foreach (var x in items) |
692 | 675 |
{ |
693 |
var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
|
|
676 |
var MarkusLink = "kcom://" + CreateMarkusParam(x.PROJECT_NO, x.DOCUMENT_ID, "doftech");
|
|
694 | 677 |
|
695 | 678 |
ConvertItem AddItem = new ConvertItem(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, |
696 |
x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.DOCUMENT_URL, convertpath[0], convertpath[1], x.RECONVERTER);
|
|
679 |
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);
|
|
697 | 680 |
Listitems.Add(AddItem); |
698 | 681 |
|
699 | 682 |
} |
... | ... | |
801 | 784 |
|
802 | 785 |
foreach (var x in items) |
803 | 786 |
{ |
804 |
var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
|
|
787 |
var MarkusLink = "kcom://" + CreateMarkusParam(x.PROJECT_NO, x.DOCUMENT_ID, "doftech");
|
|
805 | 788 |
|
806 | 789 |
ConvertItem AddItem = new ConvertItem(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, |
807 |
x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME, x.DOCUMENT_URL, convertpath[0], convertpath[1], x.RECONVERTER);
|
|
790 |
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);
|
|
808 | 791 |
Listitems.Add(AddItem); |
809 | 792 |
|
810 | 793 |
} |
... | ... | |
910 | 893 |
itemsToEach.ConvertID = item.ConvertID; |
911 | 894 |
itemsToEach.ProjectNumber = item.ProjectNumber; |
912 | 895 |
|
913 |
var convertpath = GetSearchConvertPathAndMarkus(item.ProjectNumber, item.UniqueKey);
|
|
896 |
var MarkusLink = "kcom://" + CreateMarkusParam(item.ProjectNumber, item.DocumentID, "doftech");
|
|
914 | 897 |
|
915 | 898 |
if (item.ConvertState != null) |
916 | 899 |
{ |
... | ... | |
931 | 914 |
itemsToEach.TotalPage = item.TotalPage; |
932 | 915 |
itemsToEach.OriginfilePath = item.OriginfilePath; |
933 | 916 |
itemsToEach.ConvertPath = item.ConvertPath; |
934 |
itemsToEach.MarkusLink = convertpath[1];
|
|
917 |
itemsToEach.MarkusLink = MarkusLink;
|
|
935 | 918 |
itemsToEach.UniqueKey = item.UniqueKey;//DocumentNO 없음 |
936 | 919 |
itemsToEach.GroupNo = item.GroupNo;//없음 |
937 | 920 |
itemsToEach.ProcessorAffinity = item.ProcessorAffinity; |
938 | 921 |
itemsToEach.DocumentName = item.DocumnetName; |
939 |
itemsToEach.Revision = item.Revision;//없음
|
|
922 |
itemsToEach.Revision = item.Revision; //없음
|
|
940 | 923 |
itemsToEach.Exception = item.Exception;//없음 |
941 |
itemsToEach.ConvertPath = convertpath[0];
|
|
924 |
itemsToEach.ConvertPath = item.ConvertPath;
|
|
942 | 925 |
itemsToEach.CreateTime = item.CreateTime; |
943 | 926 |
itemsToEach.ReConverter = item.ReConverter; |
944 | 927 |
itemsToEach.DocumentID = item.DocumentID; |
... | ... | |
1162 | 1145 |
} |
1163 | 1146 |
else |
1164 | 1147 |
{ |
1165 |
//ConvertDatabase _DataConvert = new ConvertDatabase(App.MarkusDataBaseConnecitonString); |
|
1166 | 1148 |
var resultRealConvert = 0; |
1167 | 1149 |
var resultFiltertConvert = 0; |
1168 | 1150 |
|
1169 | 1151 |
if (SelectRealConvert != null) |
1170 | 1152 |
{ |
1171 |
//resultRealConvert = _DataConvert.SetCleanUpItem(SelectRealConvert);//ConvertDataBase |
|
1172 | 1153 |
resultRealConvert = SetCleanUpItem(SelectRealConvert);//ConvertDataBase |
1173 | 1154 |
} |
1174 | 1155 |
else if (SelectFilterConvert != null) |
1175 | 1156 |
{ |
1176 |
//resultFiltertConvert = _DataConvert.SetCleanUpItem(SelectFilterConvert);//ConvertDataBase |
|
1177 | 1157 |
resultFiltertConvert = SetCleanUpItem(SelectFilterConvert); |
1178 | 1158 |
} |
1179 | 1159 |
System.Diagnostics.Debug.WriteLine(resultRealConvert + " " + resultFiltertConvert); |
... | ... | |
1186 | 1166 |
|
1187 | 1167 |
foreach (var x in items) |
1188 | 1168 |
{ |
1189 |
var convertpath = GetSearchConvertPathAndMarkus(x.PROJECT_NO, x.DOCUMENT_ID);
|
|
1169 |
var MarkusLink = "kcom://" + CreateMarkusParam(x.PROJECT_NO, x.DOCUMENT_ID, "doftech");
|
|
1190 | 1170 |
|
1191 | 1171 |
ConvertItem AddItem = new ConvertItem(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, x.TOTAL_PAGE, x.EXCEPTION, x.GROUP_NO, x.CREATE_DATETIME, x.START_DATETIME, x.END_DATETIME |
1192 |
, x.DOCUMENT_URL, convertpath[0], convertpath[1], x.RECONVERTER);
|
|
1172 |
, x.DOCUMENT_URL, x.CONVERT_PATH, MarkusLink, x.RECONVERTER);
|
|
1193 | 1173 |
|
1194 | 1174 |
RealConvertSource.Add(AddItem); |
1195 | 1175 |
|
... | ... | |
1200 | 1180 |
} |
1201 | 1181 |
|
1202 | 1182 |
} |
1203 |
|
|
1204 |
//ConvertDataBase |
|
1205 |
//using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(App.MarkusDataBaseConnecitonString)) |
|
1206 |
//{ |
|
1207 |
// var items = database.GetConvertProjects(SelectFilterConvert); |
|
1208 |
|
|
1209 |
// foreach (var item in items) |
|
1210 |
// { |
|
1211 |
// RealConvertSource.Add(item); |
|
1212 |
// } |
|
1213 |
// if (RealConvertSource.Count() == 1) |
|
1214 |
// { |
|
1215 |
// ConvertShow = true; |
|
1216 |
// } |
|
1217 |
//} |
|
1218 | 1183 |
} |
1219 | 1184 |
} |
1220 | 1185 |
|
... | ... | |
1243 | 1208 |
} |
1244 | 1209 |
} |
1245 | 1210 |
|
1246 |
public string[] GetSearchConvertPathAndMarkus(string PROJECT_NO, string DOCUMENT_ID) |
|
1247 |
{ |
|
1248 |
string[] ConvertPath = new string[2]; |
|
1249 |
ConvertPath[0] = GetConvertPath(PROJECT_NO, DOCUMENT_ID); |
|
1250 |
ConvertPath[1] = "kcom://" + CreateMarkusParam(PROJECT_NO, DOCUMENT_ID, "doftech"); |
|
1251 |
|
|
1252 |
return ConvertPath; |
|
1253 |
} |
|
1254 |
|
|
1255 |
#region Convert Path |
|
1256 |
|
|
1257 |
private string GetConvertPath(string ProjectNo, string DocumentID) |
|
1258 |
{ |
|
1259 |
try |
|
1260 |
{ |
|
1261 |
return Path.Combine(BaseStorage(ProjectNo), ProjectNo + "_Tile", (System.Convert.ToInt64(DocumentID) / 100).ToString(), DocumentID); |
|
1262 |
} |
|
1263 |
catch (Exception) |
|
1264 |
{ |
|
1265 |
throw new Exception("GetConvertPath Error"); |
|
1266 |
} |
|
1267 |
|
|
1268 |
} |
|
1269 |
|
|
1270 |
private string BaseStorage(string ProjectNo) |
|
1271 |
{ |
|
1272 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString)) |
|
1273 |
{ |
|
1274 |
string result = ""; |
|
1275 |
|
|
1276 |
var properties = entities.SELECT_CONVERT_ITEM(null, ProjectNo, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null).ToList(); |
|
1277 |
//var properties = entities.PROPERTIES.Where(f => f.PROPERTY == ProjectNo && f.TYPE == PROPERTIES_DEFINE.TILE_SOURCE_STORAGE);// |
|
1278 |
|
|
1279 |
|
|
1280 |
if (properties.Count() > 0) |
|
1281 |
{ |
|
1282 |
result = properties.First().PROPERTIES_VALUE; |
|
1283 |
} |
|
1284 |
else |
|
1285 |
{ |
|
1286 |
throw new Exception($"Project {ProjectNo} BaseStorage Not Setting."); |
|
1287 |
} |
|
1288 |
|
|
1289 |
return result; |
|
1290 |
} |
|
1291 |
} |
|
1292 | 1211 |
|
1293 | 1212 |
public static string CreateMarkusParam(string projectNo, string documentID, string userID) |
1294 | 1213 |
{ |
... | ... | |
1312 | 1231 |
|
1313 | 1232 |
} |
1314 | 1233 |
|
1315 |
#endregion |
|
1316 | 1234 |
|
1317 | 1235 |
#endregion |
1318 | 1236 |
|
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseView.xaml | ||
---|---|---|
92 | 92 |
<StackPanel Orientation="Vertical"> |
93 | 93 |
<controls:DatabaseFilter ProjectNo="{Binding ProjectNumberFilter,Mode=TwoWay}" UniqueKey="{Binding UniqueKeyFilter,Mode=TwoWay}" Service_ID="{Binding Service_IDFilter, Mode=TwoWay}" |
94 | 94 |
Docuemnt_Name="{Binding Document_NameFilter, Mode=TwoWay}" Docuemnt_NO="{Binding Docuemnt_NOFilter, Mode=TwoWay}" Reconverter="{Binding ReconverterFilter, Mode=TwoWay}" |
95 |
Revision="{Binding RevisionFilter, Mode=TwoWay}" GroupNO="{Binding GroupNOFilter, Mode=TwoWay}"/> |
|
95 |
Revision="{Binding RevisionFilter, Mode=TwoWay}" GroupNO="{Binding GroupNOFilter, Mode=TwoWay}" Document_URL="{Binding DOCUMENT_URLFilter, Mode=TwoWay}"/>
|
|
96 | 96 |
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> |
97 | 97 |
<telerik:RadToggleButton Content=" Convert 추가" Command="{Binding ConverAddCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
98 | 98 |
<telerik:RadToggleButton Content=" 검색" Command="{Binding DataFilterCommand, Mode=OneWay}" Width="100" Margin="0,0,20,0" HorizontalAlignment="Right"/> |
ConvertService/ServiceBase/Markus.Service.StationController/Views/DataBaseViewInfo.xaml | ||
---|---|---|
69 | 69 |
<TextBox Text="{Binding GroupNo}" |
70 | 70 |
Grid.Row="0" |
71 | 71 |
Grid.Column="2"/> |
72 |
<!--<TextBlock Text="Processor Affinity: " |
|
73 |
Grid.Row="0" |
|
74 |
Grid.Column="3"/> |
|
75 |
<TextBox Text="{Binding ProcessorAffinity}" MaxWidth="300" |
|
76 |
Grid.Row="0" |
|
77 |
Grid.Column="5" />--> |
|
78 | 72 |
<TextBlock Text="Document No: " |
79 | 73 |
Grid.Row="1" |
80 | 74 |
Grid.Column="0" HorizontalAlignment="Stretch" Margin="5,5,0,19" Grid.RowSpan="2" /> |
내보내기 Unified diff