개정판 4f02de16
issue #000: tie in point
Change-Id: I0abf8c076f7b1995a4c3fb3173c3ae810e9d1dd9
DTI_PID/ID2PSN/Form/MultiwaySetting.cs | ||
---|---|---|
68 | 68 |
|
69 | 69 |
DataTable dtType = new DataTable(); |
70 | 70 |
dtType.Columns.Add("Index"); |
71 |
dtType.Columns.Add("Multiways"); |
|
72 | 71 |
dtType.Columns.Add("Name"); |
73 | 72 |
dtType.Columns.Add(" "); |
74 | 73 |
gridControlMultiway.DataSource = dtType; |
... | ... | |
79 | 78 |
gridColumn.OptionsColumn.AllowEdit = false; |
80 | 79 |
gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; |
81 | 80 |
gridColumn.VisibleIndex = 0; |
82 |
gridColumn = gridViewMultiway.Columns[1]; |
|
83 |
gridColumn.Name = "Multiways"; |
|
84 |
gridColumn.Caption = "Transform Key Words"; |
|
85 |
gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; |
|
86 |
gridColumn.VisibleIndex = 1; |
|
87 |
//gridColumn.AppearanceHeader.BackColor = Color.Red; |
|
88 | 81 |
|
89 |
gridColumn = gridViewMultiway.Columns[2];
|
|
82 |
gridColumn = gridViewMultiway.Columns[1];
|
|
90 | 83 |
gridColumn.Name = "Name"; |
91 | 84 |
gridColumn.Caption = "ID2 Symbol Name"; |
92 | 85 |
gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; |
93 |
gridColumn.VisibleIndex = 2;
|
|
86 |
gridColumn.VisibleIndex = 1;
|
|
94 | 87 |
|
95 | 88 |
RepositoryItemTreeListLookUpEdit treeListLookUpEdit = new RepositoryItemTreeListLookUpEdit(); |
96 | 89 |
gridControlMultiway.RepositoryItems.Add(treeListLookUpEdit); |
97 | 90 |
SetSymbol(treeListLookUpEdit); |
98 | 91 |
gridColumn.ColumnEdit = treeListLookUpEdit; |
99 | 92 |
|
100 |
gridColumn = gridViewMultiway.Columns[3];
|
|
93 |
gridColumn = gridViewMultiway.Columns[2];
|
|
101 | 94 |
gridColumn.Name = "Remove"; |
102 | 95 |
gridColumn.Caption = ""; |
103 | 96 |
gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; |
104 |
gridColumn.VisibleIndex = 3;
|
|
97 |
gridColumn.VisibleIndex = 2;
|
|
105 | 98 |
gridColumn.MaxWidth = 16; |
106 | 99 |
|
107 | 100 |
gridColumn.ColumnEdit = btnRemove; |
... | ... | |
144 | 137 |
{ |
145 | 138 |
DataTable dt = DB.SelectMultiwaysSetting(); |
146 | 139 |
DataTable typeDT = gridControlMultiway.DataSource as DataTable; |
147 |
bool check = false; |
|
148 | 140 |
foreach (DataRow row in dt.Rows) |
149 | 141 |
{ |
150 | 142 |
int index = Convert.ToInt32(row["INDEX"]); |
151 | 143 |
string name = row["NAME"].ToString(); |
152 |
string Multiway = row["Multiway"].ToString(); |
|
153 |
if (!name.Equals("useID2Attribute")) |
|
154 |
typeDT.Rows.Add(index, Multiway, name, null); |
|
155 |
else |
|
156 |
{ |
|
157 |
if(Convert.ToBoolean(Multiway)) |
|
158 |
check = true; |
|
159 |
} |
|
144 |
typeDT.Rows.Add(index, name, null); |
|
160 | 145 |
} |
161 | 146 |
} |
162 | 147 |
|
... | ... | |
240 | 225 |
} |
241 | 226 |
|
242 | 227 |
DataTable dt = gridControlMultiway.DataSource as DataTable; |
243 |
dt.Rows.Add(dt.Rows.Count + 1, null, null, null);
|
|
228 |
dt.Rows.Add(dt.Rows.Count + 1, null, null); |
|
244 | 229 |
gridViewMultiway.Columns["Index"].BestFit(); |
245 | 230 |
} |
246 | 231 |
|
... | ... | |
251 | 236 |
for (int i = 0; i < MultiwayInfo.MultiwayItems.Count; i++) |
252 | 237 |
{ |
253 | 238 |
MultiwayItem item = MultiwayInfo.MultiwayItems[i]; |
254 |
dt.Rows.Add(item.Index, item.Multiway, item.Name);
|
|
239 |
dt.Rows.Add(item.Index, item.Name); |
|
255 | 240 |
} |
256 | 241 |
} |
257 | 242 |
|
... | ... | |
266 | 251 |
MultiwayInfo.MultiwayItems.Add(new MultiwayItem() |
267 | 252 |
{ |
268 | 253 |
Index = i + 1, |
269 |
Name = row["Name"].ToString(), |
|
270 |
Multiway = row["Multiways"].ToString() |
|
254 |
Name = row["Name"].ToString() |
|
271 | 255 |
}); |
272 | 256 |
} |
273 | 257 |
} |
... | ... | |
297 | 281 |
} |
298 | 282 |
|
299 | 283 |
ReNumbering(currentMultiwayInfo); |
300 |
if(currentMultiwayInfo.MultiwayItems.Find(x => x.Multiway == string.Empty || x.Name == string.Empty) != null)
|
|
284 |
if(currentMultiwayInfo.MultiwayItems.Find(x => x.Name == string.Empty) != null) |
|
301 | 285 |
{ |
302 | 286 |
MessageBox.Show("Please save after entering data.", "ID2 " + ID2Info.ProgramName, MessageBoxButtons.OK, MessageBoxIcon.Warning); |
303 | 287 |
return; |
내보내기 Unified diff