개정판 4842b66a
issue #000: GroudLevel 추가
Change-Id: Icb8e25bc0283b6e29989b297c2edde40b7fc4499
DTI_PID/ID2PSN/DB.cs | ||
---|---|---|
179 | 179 |
dicColCheck.Add("Pocket", "NVARCHAR(10)"); |
180 | 180 |
dicColCheck.Add("EGTag", "NVARCHAR(255)"); |
181 | 181 |
dicColCheck.Add("HasMLTags", "NVARCHAR(50)"); |
182 |
dicColCheck.Add("GroundLevel", "NVARCHAR(20)"); |
|
182 | 183 |
|
183 | 184 |
if (matched == null) |
184 | 185 |
{ |
185 | 186 |
var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(255), Type NVARCHAR(255), OrderNumber NVARCHAR(255), Pipeline_OID NVARCHAR(255), From_Data NVARCHAR(255), " + |
186 | 187 |
"To_Data NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), IsValid INTEGER, Status NVARCHAR(255), PBS NVARCHAR(255), Drawings NVARCHAR(255), " + |
187 |
"IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL, Pocket NVARCHAR(10), EGTag NVARCHAR(255), HasMLTags NVARCHAR(50))"; |
|
188 |
"IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL, Pocket NVARCHAR(10), EGTag NVARCHAR(255), HasMLTags NVARCHAR(50), GroundLevel NVARCHAR(50))";
|
|
188 | 189 |
using (var cmd = connection.GetSqlStringCommand(query)) |
189 | 190 |
{ |
190 | 191 |
cmd.ExecuteNonQuery(); |
... | ... | |
1897 | 1898 |
foreach (DataRow row in item.PipeSystemNetwork.Rows) |
1898 | 1899 |
{ |
1899 | 1900 |
query = $"INSERT INTO {PSN_PIPESYSTEMNETWORK} " + |
1900 |
$"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket, EGTag, HasMLTags) VALUES " + |
|
1901 |
$"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber, @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket, @EGTag, @HasMLTags)"; |
|
1901 |
$"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket, EGTag, HasMLTags, GroundLevel) VALUES " +
|
|
1902 |
$"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber, @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket, @EGTag, @HasMLTags, @GroundLevel)";
|
|
1902 | 1903 |
var cmd = connection.GetSqlStringCommand(query); |
1903 | 1904 |
AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString()); |
1904 | 1905 |
AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString()); |
... | ... | |
1933 | 1934 |
|
1934 | 1935 |
AddWithValue(cmd, "@EGTag", string.IsNullOrEmpty(row["EGTag"].ToString()) ? "" : row["EGTag"].ToString()); |
1935 | 1936 |
AddWithValue(cmd, "@HasMLTags", string.IsNullOrEmpty(row["HasMLTags"].ToString()) ? "False" : row["HasMLTags"].ToString()); |
1937 |
AddWithValue(cmd, "@GroundLevel", string.IsNullOrEmpty(row["GroundLevel"].ToString()) ? "" : row["GroundLevel"].ToString()); |
|
1936 | 1938 |
connection.ExecuteNonQuery(cmd, txn); |
1937 | 1939 |
} |
1938 | 1940 |
|
... | ... | |
2359 | 2361 |
|
2360 | 2362 |
newRow["EGTag"] = row["EGTag"].ToString(); |
2361 | 2363 |
newRow["HasMLTags"] = row["HasMLTags"].ToString(); |
2364 |
newRow["GroundLevel"] = row["GroundLevel"].ToString(); |
|
2362 | 2365 |
result.PipeSystemNetwork.Rows.Add(newRow); |
2363 | 2366 |
} |
2364 | 2367 |
} |
... | ... | |
2557 | 2560 |
newRow["Pocket"] = row["Pocket"].ToString(); |
2558 | 2561 |
newRow["EGTag"] = row["EGTag"].ToString(); |
2559 | 2562 |
newRow["HasMLTags"] = row["HasMLTags"].ToString(); |
2560 |
|
|
2563 |
newRow["GroundLevel"] = row["GroundLevel"].ToString(); |
|
2561 | 2564 |
dt.Rows.Add(newRow); |
2562 | 2565 |
} |
2563 | 2566 |
} |
... | ... | |
2692 | 2695 |
dicColCheck.Add("Pocket", "NVARCHAR(10)"); |
2693 | 2696 |
dicColCheck.Add("EGTag", "NVARCHAR(255)"); |
2694 | 2697 |
dicColCheck.Add("HasMLTags", "NVARCHAR(50)"); |
2695 |
|
|
2698 |
dicColCheck.Add("GroundLevel", "NVARCHAR(20)"); |
|
2696 | 2699 |
if (matched == null) |
2697 | 2700 |
{ |
2698 | 2701 |
var query = $"CREATE TABLE {PSN_PIPESYSTEMNETWORK} (OID NVARCHAR(255), Type NVARCHAR(255), OrderNumber NVARCHAR(255), Pipeline_OID NVARCHAR(255), From_Data NVARCHAR(255), " + |
2699 | 2702 |
"To_Data NVARCHAR(255), TopologySet_OID_Key NVARCHAR(125), PSNRevisionNumber NVARCHAR(255), IsValid INTEGER, Status NVARCHAR(255), PBS NVARCHAR(255), Drawings NVARCHAR(255), " + |
2700 |
"IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL, Pocket NVARCHAR(10), EGTag NVARCHAR(255), HasMLTags NVARCHAR(50))"; |
|
2703 |
"IncludingVirtualData NVARCHAR(10), PSNAccuracy REAL, Pocket NVARCHAR(10), EGTag NVARCHAR(255), HasMLTags NVARCHAR(50), GroundLevel NVARCHAR(50))";
|
|
2701 | 2704 |
using (var cmd = connection.GetSqlStringCommand(query)) |
2702 | 2705 |
{ |
2703 | 2706 |
cmd.ExecuteNonQuery(); |
... | ... | |
3432 | 3435 |
foreach (DataRow row in item.PipeSystemNetwork.Rows) |
3433 | 3436 |
{ |
3434 | 3437 |
query = $"INSERT INTO {PSN_PIPESYSTEMNETWORK} " + |
3435 |
$"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket, EGTag, HasMLTags) VALUES " + |
|
3436 |
$"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber, @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket, @EGTag, @HasMLTags)"; |
|
3438 |
$"(OID, Type, OrderNumber, Pipeline_OID, FROM_DATA, TO_DATA, TopologySet_OID_Key, PSNRevisionNumber, PBS, Drawings, IsValid, Status, IncludingVirtualData, PSNAccuracy, Pocket, EGTag, HasMLTags, GroundLevel) VALUES " +
|
|
3439 |
$"(@OID, @Type, @OrderNumber, @Pipeline_OID, @FROM_DATA, @TO_DATA, @TopologySet_OID_Key, @PSNRevisionNumber, @PBS, @Drawings, @IsValid, @Status, @IncludingVirtualData, @PSNAccuracy, @Pocket, @EGTag, @HasMLTags, @GroundLevel)";
|
|
3437 | 3440 |
var cmd = connection.GetSqlStringCommand(query); |
3438 | 3441 |
AddWithValue(cmd, "@OID", string.IsNullOrEmpty(row["OID"].ToString()) ? "" : row["OID"].ToString()); |
3439 | 3442 |
AddWithValue(cmd, "@Type", string.IsNullOrEmpty(row["Type"].ToString()) ? "" : row["Type"].ToString()); |
... | ... | |
3467 | 3470 |
AddWithValue(cmd, "@Pocket", string.IsNullOrEmpty(row["Pocket"].ToString()) ? "Yes" : row["Pocket"].ToString()); |
3468 | 3471 |
AddWithValue(cmd, "@EGTag", string.IsNullOrEmpty(row["EGTag"].ToString()) ? "" : row["EGTag"].ToString()); |
3469 | 3472 |
AddWithValue(cmd, "@HasMLTags", string.IsNullOrEmpty(row["HasMLTags"].ToString()) ? "False" : row["HasMLTags"].ToString()); |
3470 |
|
|
3473 |
AddWithValue(cmd, "@GroundLevel", string.IsNullOrEmpty(row["GroundLevel"].ToString()) ? "" : row["GroundLevel"].ToString()); |
|
3471 | 3474 |
connection.ExecuteNonQuery(cmd, txn); |
3472 | 3475 |
} |
3473 | 3476 |
|
DTI_PID/ID2PSN/Form/DrawingList.Designer.cs | ||
---|---|---|
59 | 59 |
this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False; |
60 | 60 |
this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; |
61 | 61 |
this.ribbonControl.ShowToolbarCustomizeItem = false; |
62 |
this.ribbonControl.Size = new System.Drawing.Size(333, 32);
|
|
62 |
this.ribbonControl.Size = new System.Drawing.Size(341, 32);
|
|
63 | 63 |
this.ribbonControl.Toolbar.ShowCustomizeItem = false; |
64 | 64 |
// |
65 | 65 |
// layoutControl1 |
... | ... | |
70 | 70 |
this.layoutControl1.Name = "layoutControl1"; |
71 | 71 |
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(963, 307, 650, 400); |
72 | 72 |
this.layoutControl1.Root = this.Root; |
73 |
this.layoutControl1.Size = new System.Drawing.Size(333, 130);
|
|
73 |
this.layoutControl1.Size = new System.Drawing.Size(341, 134);
|
|
74 | 74 |
this.layoutControl1.TabIndex = 1; |
75 | 75 |
this.layoutControl1.Text = "layoutControl1"; |
76 | 76 |
// |
... | ... | |
78 | 78 |
// |
79 | 79 |
this.lbDrawingList.Location = new System.Drawing.Point(12, 12); |
80 | 80 |
this.lbDrawingList.Name = "lbDrawingList"; |
81 |
this.lbDrawingList.Size = new System.Drawing.Size(309, 106);
|
|
81 |
this.lbDrawingList.Size = new System.Drawing.Size(317, 110);
|
|
82 | 82 |
this.lbDrawingList.StyleController = this.layoutControl1; |
83 | 83 |
this.lbDrawingList.TabIndex = 7; |
84 | 84 |
this.lbDrawingList.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lbDrawingList_MouseDoubleClick); |
... | ... | |
90 | 90 |
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
91 | 91 |
this.layoutControlItem1}); |
92 | 92 |
this.Root.Name = "Root"; |
93 |
this.Root.Size = new System.Drawing.Size(333, 130);
|
|
93 |
this.Root.Size = new System.Drawing.Size(341, 134);
|
|
94 | 94 |
this.Root.TextVisible = false; |
95 | 95 |
// |
96 | 96 |
// layoutControlItem1 |
... | ... | |
98 | 98 |
this.layoutControlItem1.Control = this.lbDrawingList; |
99 | 99 |
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); |
100 | 100 |
this.layoutControlItem1.Name = "layoutControlItem1"; |
101 |
this.layoutControlItem1.Size = new System.Drawing.Size(313, 110);
|
|
101 |
this.layoutControlItem1.Size = new System.Drawing.Size(321, 114);
|
|
102 | 102 |
this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); |
103 | 103 |
this.layoutControlItem1.TextVisible = false; |
104 | 104 |
// |
... | ... | |
106 | 106 |
// |
107 | 107 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); |
108 | 108 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
109 |
this.ClientSize = new System.Drawing.Size(333, 162);
|
|
109 |
this.ClientSize = new System.Drawing.Size(341, 166);
|
|
110 | 110 |
this.Controls.Add(this.layoutControl1); |
111 | 111 |
this.Controls.Add(this.ribbonControl); |
112 | 112 |
this.Name = "DrawingList"; |
DTI_PID/ID2PSN/Form/EquipmentNoPocketSetting.Designer.cs | ||
---|---|---|
74 | 74 |
this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False; |
75 | 75 |
this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; |
76 | 76 |
this.ribbonControl.ShowToolbarCustomizeItem = false; |
77 |
this.ribbonControl.Size = new System.Drawing.Size(655, 32);
|
|
77 |
this.ribbonControl.Size = new System.Drawing.Size(663, 32);
|
|
78 | 78 |
this.ribbonControl.Toolbar.ShowCustomizeItem = false; |
79 | 79 |
// |
80 | 80 |
// layoutControl1 |
... | ... | |
88 | 88 |
this.layoutControl1.Name = "layoutControl1"; |
89 | 89 |
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(488, 408, 650, 400); |
90 | 90 |
this.layoutControl1.Root = this.Root; |
91 |
this.layoutControl1.Size = new System.Drawing.Size(655, 655);
|
|
91 |
this.layoutControl1.Size = new System.Drawing.Size(663, 659);
|
|
92 | 92 |
this.layoutControl1.TabIndex = 1; |
93 | 93 |
this.layoutControl1.Text = "layoutControl1"; |
94 | 94 |
// |
... | ... | |
98 | 98 |
this.gridEquipment.MainView = this.gridViewEquipment; |
99 | 99 |
this.gridEquipment.MenuManager = this.ribbonControl; |
100 | 100 |
this.gridEquipment.Name = "gridEquipment"; |
101 |
this.gridEquipment.Size = new System.Drawing.Size(607, 522);
|
|
101 |
this.gridEquipment.Size = new System.Drawing.Size(615, 526);
|
|
102 | 102 |
this.gridEquipment.TabIndex = 4; |
103 | 103 |
this.gridEquipment.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { |
104 | 104 |
this.gridViewEquipment}); |
... | ... | |
112 | 112 |
// btnClose |
113 | 113 |
// |
114 | 114 |
this.btnClose.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnClose.ImageOptions.Image"))); |
115 |
this.btnClose.Location = new System.Drawing.Point(573, 607);
|
|
115 |
this.btnClose.Location = new System.Drawing.Point(581, 611);
|
|
116 | 116 |
this.btnClose.Name = "btnClose"; |
117 | 117 |
this.btnClose.Size = new System.Drawing.Size(70, 36); |
118 | 118 |
this.btnClose.StyleController = this.layoutControl1; |
... | ... | |
123 | 123 |
// btnSave |
124 | 124 |
// |
125 | 125 |
this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image"))); |
126 |
this.btnSave.Location = new System.Drawing.Point(481, 607);
|
|
126 |
this.btnSave.Location = new System.Drawing.Point(489, 611);
|
|
127 | 127 |
this.btnSave.Name = "btnSave"; |
128 | 128 |
this.btnSave.Size = new System.Drawing.Size(68, 36); |
129 | 129 |
this.btnSave.StyleController = this.layoutControl1; |
... | ... | |
133 | 133 |
// |
134 | 134 |
// btnAddValveGroup |
135 | 135 |
// |
136 |
this.btnAddValveGroup.Location = new System.Drawing.Point(496, 43);
|
|
136 |
this.btnAddValveGroup.Location = new System.Drawing.Point(502, 43);
|
|
137 | 137 |
this.btnAddValveGroup.Name = "btnAddValveGroup"; |
138 |
this.btnAddValveGroup.Size = new System.Drawing.Size(135, 22);
|
|
138 |
this.btnAddValveGroup.Size = new System.Drawing.Size(137, 22);
|
|
139 | 139 |
this.btnAddValveGroup.StyleController = this.layoutControl1; |
140 | 140 |
this.btnAddValveGroup.TabIndex = 2; |
141 | 141 |
this.btnAddValveGroup.Text = " Add Equipment"; |
... | ... | |
152 | 152 |
this.emptySpaceItem2, |
153 | 153 |
this.layoutControlGroup2}); |
154 | 154 |
this.Root.Name = "Root"; |
155 |
this.Root.Size = new System.Drawing.Size(655, 655);
|
|
155 |
this.Root.Size = new System.Drawing.Size(663, 659);
|
|
156 | 156 |
this.Root.TextVisible = false; |
157 | 157 |
// |
158 | 158 |
// emptySpaceItem3 |
159 | 159 |
// |
160 | 160 |
this.emptySpaceItem3.AllowHotTrack = false; |
161 |
this.emptySpaceItem3.Location = new System.Drawing.Point(0, 595);
|
|
161 |
this.emptySpaceItem3.Location = new System.Drawing.Point(0, 599);
|
|
162 | 162 |
this.emptySpaceItem3.Name = "emptySpaceItem3"; |
163 |
this.emptySpaceItem3.Size = new System.Drawing.Size(469, 40);
|
|
163 |
this.emptySpaceItem3.Size = new System.Drawing.Size(477, 40);
|
|
164 | 164 |
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0); |
165 | 165 |
// |
166 | 166 |
// layoutControlItem4 |
167 | 167 |
// |
168 | 168 |
this.layoutControlItem4.Control = this.btnSave; |
169 |
this.layoutControlItem4.Location = new System.Drawing.Point(469, 595);
|
|
169 |
this.layoutControlItem4.Location = new System.Drawing.Point(477, 599);
|
|
170 | 170 |
this.layoutControlItem4.MaxSize = new System.Drawing.Size(72, 40); |
171 | 171 |
this.layoutControlItem4.MinSize = new System.Drawing.Size(72, 40); |
172 | 172 |
this.layoutControlItem4.Name = "layoutControlItem4"; |
... | ... | |
178 | 178 |
// layoutControlItem5 |
179 | 179 |
// |
180 | 180 |
this.layoutControlItem5.Control = this.btnClose; |
181 |
this.layoutControlItem5.Location = new System.Drawing.Point(561, 595);
|
|
181 |
this.layoutControlItem5.Location = new System.Drawing.Point(569, 599);
|
|
182 | 182 |
this.layoutControlItem5.MaxSize = new System.Drawing.Size(74, 40); |
183 | 183 |
this.layoutControlItem5.MinSize = new System.Drawing.Size(74, 40); |
184 | 184 |
this.layoutControlItem5.Name = "layoutControlItem5"; |
... | ... | |
190 | 190 |
// emptySpaceItem2 |
191 | 191 |
// |
192 | 192 |
this.emptySpaceItem2.AllowHotTrack = false; |
193 |
this.emptySpaceItem2.Location = new System.Drawing.Point(541, 595);
|
|
193 |
this.emptySpaceItem2.Location = new System.Drawing.Point(549, 599);
|
|
194 | 194 |
this.emptySpaceItem2.MaxSize = new System.Drawing.Size(20, 40); |
195 | 195 |
this.emptySpaceItem2.MinSize = new System.Drawing.Size(20, 40); |
196 | 196 |
this.emptySpaceItem2.Name = "emptySpaceItem2"; |
... | ... | |
207 | 207 |
this.emptySpaceItem1}); |
208 | 208 |
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0); |
209 | 209 |
this.layoutControlGroup2.Name = "layoutControlGroup2"; |
210 |
this.layoutControlGroup2.Size = new System.Drawing.Size(635, 595);
|
|
210 |
this.layoutControlGroup2.Size = new System.Drawing.Size(643, 599);
|
|
211 | 211 |
this.layoutControlGroup2.Text = "Equipment No Pocket Items"; |
212 | 212 |
// |
213 | 213 |
// layoutControlItem6 |
... | ... | |
215 | 215 |
this.layoutControlItem6.Control = this.gridEquipment; |
216 | 216 |
this.layoutControlItem6.Location = new System.Drawing.Point(0, 26); |
217 | 217 |
this.layoutControlItem6.Name = "layoutControlItem6"; |
218 |
this.layoutControlItem6.Size = new System.Drawing.Size(611, 526);
|
|
218 |
this.layoutControlItem6.Size = new System.Drawing.Size(619, 530);
|
|
219 | 219 |
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); |
220 | 220 |
this.layoutControlItem6.TextVisible = false; |
221 | 221 |
// |
222 | 222 |
// layoutControlItem3 |
223 | 223 |
// |
224 | 224 |
this.layoutControlItem3.Control = this.btnAddValveGroup; |
225 |
this.layoutControlItem3.Location = new System.Drawing.Point(472, 0);
|
|
225 |
this.layoutControlItem3.Location = new System.Drawing.Point(478, 0);
|
|
226 | 226 |
this.layoutControlItem3.Name = "layoutControlItem3"; |
227 |
this.layoutControlItem3.Size = new System.Drawing.Size(139, 26);
|
|
227 |
this.layoutControlItem3.Size = new System.Drawing.Size(141, 26);
|
|
228 | 228 |
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); |
229 | 229 |
this.layoutControlItem3.TextVisible = false; |
230 | 230 |
// |
... | ... | |
233 | 233 |
this.emptySpaceItem1.AllowHotTrack = false; |
234 | 234 |
this.emptySpaceItem1.Location = new System.Drawing.Point(0, 0); |
235 | 235 |
this.emptySpaceItem1.Name = "emptySpaceItem1"; |
236 |
this.emptySpaceItem1.Size = new System.Drawing.Size(472, 26);
|
|
236 |
this.emptySpaceItem1.Size = new System.Drawing.Size(478, 26);
|
|
237 | 237 |
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); |
238 | 238 |
// |
239 | 239 |
// EquipmentNoPocketSetting |
240 | 240 |
// |
241 | 241 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); |
242 | 242 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
243 |
this.ClientSize = new System.Drawing.Size(655, 687);
|
|
243 |
this.ClientSize = new System.Drawing.Size(663, 691);
|
|
244 | 244 |
this.Controls.Add(this.layoutControl1); |
245 | 245 |
this.Controls.Add(this.ribbonControl); |
246 | 246 |
this.Name = "EquipmentNoPocketSetting"; |
DTI_PID/ID2PSN/Form/MainForm.cs | ||
---|---|---|
309 | 309 |
|| Convert.ToDouble(selectRow["PSNAccuracy"].ToString().Replace("%", "")) != Convert.ToDouble(row["PSNAccuracy"].ToString().Replace("%", "")) |
310 | 310 |
|| selectRow["Pocket"].ToString() != row["Pocket"].ToString() |
311 | 311 |
|| selectRow["EGTag"].ToString() != row["EGTag"].ToString() |
312 |
|| selectRow["HasMLTags"].ToString() != row["HasMLTags"].ToString()) |
|
312 |
|| selectRow["HasMLTags"].ToString() != row["HasMLTags"].ToString() |
|
313 |
|| selectRow["GroundLevel"].ToString() != row["GroundLevel"].ToString()) |
|
313 | 314 |
{ |
314 | 315 |
bCheck = true; |
315 | 316 |
} |
... | ... | |
485 | 486 |
|
486 | 487 |
PSNPageDT.Columns.Add("EGTag", typeof(string)); |
487 | 488 |
PSNPageDT.Columns.Add("HasMLTags", typeof(string)); |
489 |
PSNPageDT.Columns.Add("GroundLevel", typeof(string)); |
|
488 | 490 |
PSNPageDT.Columns.Add("Pocket", typeof(string)); |
489 | 491 |
PSNPageDT.Columns.Add("IsValid", typeof(string)); |
490 | 492 |
PSNPageDT.Columns.Add("Status", typeof(string)); |
491 | 493 |
PSNPageDT.Columns.Add("IncludingVirtualData", typeof(string)); |
492 | 494 |
PSNPageDT.Columns.Add("PSNAccuracy", typeof(string)); |
493 |
//PSNPageDT.Columns.Add("AFC", typeof(string));
|
|
495 |
// PSNPageDT.Columns.Add("AFC", typeof(string));
|
|
494 | 496 |
PSNPageDT.Columns.Add("Show", typeof(string)); |
495 | 497 |
|
496 | 498 |
|
... | ... | |
501 | 503 |
gridViewPSN.Columns["FROM_DATA"].Caption = "From"; |
502 | 504 |
gridViewPSN.Columns["TO_DATA"].Caption = "To"; |
503 | 505 |
gridViewPSN.Columns["TopologySet_OID_Key"].Caption = "SeqData ID"; |
504 |
gridViewPSN.Columns["PSNRevisionNumber"].Caption = "Revision"; |
|
505 |
gridViewPSN.Columns["Show"].Caption = " "; |
|
506 |
gridViewPSN.Columns["PSNAccuracy"].DisplayFormat.FormatString = "{ 0:#.##}";
|
|
507 |
gridViewPSN.Columns["EGTag"].DisplayFormat.FormatString = "EG Tag";
|
|
508 |
gridViewPSN.Columns["HasMLTags"].DisplayFormat.FormatString = "ML Tags";
|
|
509 |
gridViewPSN.Columns["IsValid"].DisplayFormat.FormatString = "Validity";
|
|
506 |
gridViewPSN.Columns["PSNRevisionNumber"].Caption = "Revision";
|
|
507 |
|
|
508 |
gridViewPSN.Columns["EGTag"].Caption = "EG Tag";
|
|
509 |
gridViewPSN.Columns["HasMLTags"].Caption = "ML Tags";
|
|
510 |
gridViewPSN.Columns["GroundLevel"].Caption = "Level";
|
|
511 |
gridViewPSN.Columns["IsValid"].Caption = "Validity";
|
|
510 | 512 |
|
513 |
gridViewPSN.Columns["PSNAccuracy"].DisplayFormat.FormatString = "{ 0:#.##}"; |
|
514 |
gridViewPSN.Columns["Show"].Caption = " "; |
|
511 | 515 |
repositoryGroupType2 = new RepositoryItemComboBox(); |
512 | 516 |
repositoryGroupType2.Items.AddRange(new string[] { "Yes", "No" }); |
513 | 517 |
repositoryGroupType2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; |
... | ... | |
630 | 634 |
newRow["Pocket"] = row["Pocket"].ToString(); |
631 | 635 |
newRow["EGTag"] = row["EGTag"].ToString(); |
632 | 636 |
newRow["HasMLTags"] = row["HasMLTags"].ToString(); |
637 |
newRow["GroundLevel"] = row["GroundLevel"].ToString(); |
|
633 | 638 |
//if(row.Table.Columns["AFC"] != null) |
634 | 639 |
// newRow["AFC"] = row["AFC"].ToString(); |
635 |
|
|
640 |
|
|
636 | 641 |
PSNPageDT.Rows.Add(newRow); |
637 | 642 |
} |
638 | 643 |
|
DTI_PID/ID2PSN/Form/TopologyRuleForm.Designer.cs | ||
---|---|---|
82 | 82 |
this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False; |
83 | 83 |
this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; |
84 | 84 |
this.ribbonControl.ShowToolbarCustomizeItem = false; |
85 |
this.ribbonControl.Size = new System.Drawing.Size(435, 32);
|
|
85 |
this.ribbonControl.Size = new System.Drawing.Size(443, 32);
|
|
86 | 86 |
this.ribbonControl.Toolbar.ShowCustomizeItem = false; |
87 | 87 |
// |
88 | 88 |
// layoutControl1 |
... | ... | |
99 | 99 |
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(642, 278, 650, 400); |
100 | 100 |
this.layoutControl1.OptionsView.UseDefaultDragAndDropRendering = false; |
101 | 101 |
this.layoutControl1.Root = this.Root; |
102 |
this.layoutControl1.Size = new System.Drawing.Size(435, 509);
|
|
102 |
this.layoutControl1.Size = new System.Drawing.Size(443, 513);
|
|
103 | 103 |
this.layoutControl1.TabIndex = 1; |
104 | 104 |
this.layoutControl1.Text = "layoutControl1"; |
105 | 105 |
// |
... | ... | |
109 | 109 |
this.gridControlRule.MainView = this.gridViewRule; |
110 | 110 |
this.gridControlRule.MenuManager = this.ribbonControl; |
111 | 111 |
this.gridControlRule.Name = "gridControlRule"; |
112 |
this.gridControlRule.Size = new System.Drawing.Size(411, 419);
|
|
112 |
this.gridControlRule.Size = new System.Drawing.Size(419, 423);
|
|
113 | 113 |
this.gridControlRule.TabIndex = 2; |
114 | 114 |
this.gridControlRule.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { |
115 | 115 |
this.gridViewRule}); |
... | ... | |
124 | 124 |
// btnClose |
125 | 125 |
// |
126 | 126 |
this.btnClose.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnClose.ImageOptions.Image"))); |
127 |
this.btnClose.Location = new System.Drawing.Point(353, 461);
|
|
127 |
this.btnClose.Location = new System.Drawing.Point(361, 465);
|
|
128 | 128 |
this.btnClose.Name = "btnClose"; |
129 | 129 |
this.btnClose.Size = new System.Drawing.Size(70, 36); |
130 | 130 |
this.btnClose.StyleController = this.layoutControl1; |
... | ... | |
135 | 135 |
// btnSave |
136 | 136 |
// |
137 | 137 |
this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image"))); |
138 |
this.btnSave.Location = new System.Drawing.Point(261, 461);
|
|
138 |
this.btnSave.Location = new System.Drawing.Point(269, 465);
|
|
139 | 139 |
this.btnSave.Name = "btnSave"; |
140 | 140 |
this.btnSave.Size = new System.Drawing.Size(68, 36); |
141 | 141 |
this.btnSave.StyleController = this.layoutControl1; |
... | ... | |
146 | 146 |
// Upbtn |
147 | 147 |
// |
148 | 148 |
this.Upbtn.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("Upbtn.ImageOptions.Image"))); |
149 |
this.Upbtn.Location = new System.Drawing.Point(305, 12);
|
|
149 |
this.Upbtn.Location = new System.Drawing.Point(311, 12);
|
|
150 | 150 |
this.Upbtn.Name = "Upbtn"; |
151 | 151 |
this.Upbtn.Size = new System.Drawing.Size(24, 22); |
152 | 152 |
this.Upbtn.StyleController = this.layoutControl1; |
... | ... | |
156 | 156 |
// DownBtn |
157 | 157 |
// |
158 | 158 |
this.DownBtn.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("DownBtn.ImageOptions.Image"))); |
159 |
this.DownBtn.Location = new System.Drawing.Point(353, 12);
|
|
159 |
this.DownBtn.Location = new System.Drawing.Point(359, 12);
|
|
160 | 160 |
this.DownBtn.Name = "DownBtn"; |
161 |
this.DownBtn.Size = new System.Drawing.Size(26, 22);
|
|
161 |
this.DownBtn.Size = new System.Drawing.Size(27, 22);
|
|
162 | 162 |
this.DownBtn.StyleController = this.layoutControl1; |
163 | 163 |
this.DownBtn.TabIndex = 6; |
164 | 164 |
this.DownBtn.Click += new System.EventHandler(this.DownBtn_Click); |
... | ... | |
166 | 166 |
// DelBtn |
167 | 167 |
// |
168 | 168 |
this.DelBtn.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("DelBtn.ImageOptions.Image"))); |
169 |
this.DelBtn.Location = new System.Drawing.Point(397, 12);
|
|
169 |
this.DelBtn.Location = new System.Drawing.Point(404, 12);
|
|
170 | 170 |
this.DelBtn.Name = "DelBtn"; |
171 |
this.DelBtn.Size = new System.Drawing.Size(26, 22);
|
|
171 |
this.DelBtn.Size = new System.Drawing.Size(27, 22);
|
|
172 | 172 |
this.DelBtn.StyleController = this.layoutControl1; |
173 | 173 |
this.DelBtn.TabIndex = 7; |
174 | 174 |
this.DelBtn.Click += new System.EventHandler(this.DelBtn_Click); |
... | ... | |
190 | 190 |
this.emptySpaceItem5, |
191 | 191 |
this.layoutControlItem6}); |
192 | 192 |
this.Root.Name = "Root"; |
193 |
this.Root.Size = new System.Drawing.Size(435, 509);
|
|
193 |
this.Root.Size = new System.Drawing.Size(443, 513);
|
|
194 | 194 |
this.Root.TextVisible = false; |
195 | 195 |
// |
196 | 196 |
// layoutControlItem1 |
... | ... | |
198 | 198 |
this.layoutControlItem1.Control = this.gridControlRule; |
199 | 199 |
this.layoutControlItem1.Location = new System.Drawing.Point(0, 26); |
200 | 200 |
this.layoutControlItem1.Name = "layoutControlItem1"; |
201 |
this.layoutControlItem1.Size = new System.Drawing.Size(415, 423);
|
|
201 |
this.layoutControlItem1.Size = new System.Drawing.Size(423, 427);
|
|
202 | 202 |
this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); |
203 | 203 |
this.layoutControlItem1.TextVisible = false; |
204 | 204 |
// |
205 | 205 |
// layoutControlItem2 |
206 | 206 |
// |
207 | 207 |
this.layoutControlItem2.Control = this.btnSave; |
208 |
this.layoutControlItem2.Location = new System.Drawing.Point(249, 449);
|
|
208 |
this.layoutControlItem2.Location = new System.Drawing.Point(257, 453);
|
|
209 | 209 |
this.layoutControlItem2.MaxSize = new System.Drawing.Size(72, 40); |
210 | 210 |
this.layoutControlItem2.MinSize = new System.Drawing.Size(72, 40); |
211 | 211 |
this.layoutControlItem2.Name = "layoutControlItem2"; |
... | ... | |
217 | 217 |
// layoutControlItem3 |
218 | 218 |
// |
219 | 219 |
this.layoutControlItem3.Control = this.btnClose; |
220 |
this.layoutControlItem3.Location = new System.Drawing.Point(341, 449);
|
|
220 |
this.layoutControlItem3.Location = new System.Drawing.Point(349, 453);
|
|
221 | 221 |
this.layoutControlItem3.MaxSize = new System.Drawing.Size(74, 40); |
222 | 222 |
this.layoutControlItem3.MinSize = new System.Drawing.Size(74, 40); |
223 | 223 |
this.layoutControlItem3.Name = "layoutControlItem3"; |
... | ... | |
229 | 229 |
// emptySpaceItem1 |
230 | 230 |
// |
231 | 231 |
this.emptySpaceItem1.AllowHotTrack = false; |
232 |
this.emptySpaceItem1.Location = new System.Drawing.Point(321, 449);
|
|
232 |
this.emptySpaceItem1.Location = new System.Drawing.Point(329, 453);
|
|
233 | 233 |
this.emptySpaceItem1.MaxSize = new System.Drawing.Size(20, 40); |
234 | 234 |
this.emptySpaceItem1.MinSize = new System.Drawing.Size(20, 40); |
235 | 235 |
this.emptySpaceItem1.Name = "emptySpaceItem1"; |
... | ... | |
240 | 240 |
// emptySpaceItem2 |
241 | 241 |
// |
242 | 242 |
this.emptySpaceItem2.AllowHotTrack = false; |
243 |
this.emptySpaceItem2.Location = new System.Drawing.Point(0, 449);
|
|
243 |
this.emptySpaceItem2.Location = new System.Drawing.Point(0, 453);
|
|
244 | 244 |
this.emptySpaceItem2.Name = "emptySpaceItem2"; |
245 |
this.emptySpaceItem2.Size = new System.Drawing.Size(249, 40);
|
|
245 |
this.emptySpaceItem2.Size = new System.Drawing.Size(257, 40);
|
|
246 | 246 |
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); |
247 | 247 |
// |
248 | 248 |
// emptySpaceItem3 |
... | ... | |
250 | 250 |
this.emptySpaceItem3.AllowHotTrack = false; |
251 | 251 |
this.emptySpaceItem3.Location = new System.Drawing.Point(0, 0); |
252 | 252 |
this.emptySpaceItem3.Name = "emptySpaceItem3"; |
253 |
this.emptySpaceItem3.Size = new System.Drawing.Size(293, 26);
|
|
253 |
this.emptySpaceItem3.Size = new System.Drawing.Size(299, 26);
|
|
254 | 254 |
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0); |
255 | 255 |
// |
256 | 256 |
// layoutControlItem4 |
257 | 257 |
// |
258 | 258 |
this.layoutControlItem4.Control = this.Upbtn; |
259 |
this.layoutControlItem4.Location = new System.Drawing.Point(293, 0);
|
|
259 |
this.layoutControlItem4.Location = new System.Drawing.Point(299, 0);
|
|
260 | 260 |
this.layoutControlItem4.Name = "layoutControlItem4"; |
261 | 261 |
this.layoutControlItem4.Size = new System.Drawing.Size(28, 26); |
262 | 262 |
this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); |
... | ... | |
265 | 265 |
// layoutControlItem5 |
266 | 266 |
// |
267 | 267 |
this.layoutControlItem5.Control = this.DownBtn; |
268 |
this.layoutControlItem5.Location = new System.Drawing.Point(341, 0);
|
|
268 |
this.layoutControlItem5.Location = new System.Drawing.Point(347, 0);
|
|
269 | 269 |
this.layoutControlItem5.Name = "layoutControlItem5"; |
270 |
this.layoutControlItem5.Size = new System.Drawing.Size(30, 26);
|
|
270 |
this.layoutControlItem5.Size = new System.Drawing.Size(31, 26);
|
|
271 | 271 |
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); |
272 | 272 |
this.layoutControlItem5.TextVisible = false; |
273 | 273 |
// |
274 | 274 |
// emptySpaceItem4 |
275 | 275 |
// |
276 | 276 |
this.emptySpaceItem4.AllowHotTrack = false; |
277 |
this.emptySpaceItem4.Location = new System.Drawing.Point(321, 0);
|
|
277 |
this.emptySpaceItem4.Location = new System.Drawing.Point(327, 0);
|
|
278 | 278 |
this.emptySpaceItem4.Name = "emptySpaceItem4"; |
279 | 279 |
this.emptySpaceItem4.Size = new System.Drawing.Size(20, 26); |
280 | 280 |
this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0); |
... | ... | |
282 | 282 |
// emptySpaceItem5 |
283 | 283 |
// |
284 | 284 |
this.emptySpaceItem5.AllowHotTrack = false; |
285 |
this.emptySpaceItem5.Location = new System.Drawing.Point(371, 0);
|
|
285 |
this.emptySpaceItem5.Location = new System.Drawing.Point(378, 0);
|
|
286 | 286 |
this.emptySpaceItem5.Name = "emptySpaceItem5"; |
287 | 287 |
this.emptySpaceItem5.Size = new System.Drawing.Size(14, 26); |
288 | 288 |
this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0); |
... | ... | |
290 | 290 |
// layoutControlItem6 |
291 | 291 |
// |
292 | 292 |
this.layoutControlItem6.Control = this.DelBtn; |
293 |
this.layoutControlItem6.Location = new System.Drawing.Point(385, 0);
|
|
293 |
this.layoutControlItem6.Location = new System.Drawing.Point(392, 0);
|
|
294 | 294 |
this.layoutControlItem6.Name = "layoutControlItem6"; |
295 |
this.layoutControlItem6.Size = new System.Drawing.Size(30, 26);
|
|
295 |
this.layoutControlItem6.Size = new System.Drawing.Size(31, 26);
|
|
296 | 296 |
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); |
297 | 297 |
this.layoutControlItem6.TextVisible = false; |
298 | 298 |
// |
... | ... | |
300 | 300 |
// |
301 | 301 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); |
302 | 302 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
303 |
this.ClientSize = new System.Drawing.Size(435, 541);
|
|
303 |
this.ClientSize = new System.Drawing.Size(443, 545);
|
|
304 | 304 |
this.Controls.Add(this.layoutControl1); |
305 | 305 |
this.Controls.Add(this.ribbonControl); |
306 | 306 |
this.Name = "TopologyRuleForm"; |
DTI_PID/ID2PSN/PSN.cs | ||
---|---|---|
2182 | 2182 |
pipeSystemNetworkDT.Columns.Add("Pocket", typeof(string)); |
2183 | 2183 |
pipeSystemNetworkDT.Columns.Add("EGTag", typeof(string)); |
2184 | 2184 |
pipeSystemNetworkDT.Columns.Add("HasMLTags", typeof(string)); |
2185 |
pipeSystemNetworkDT.Columns.Add("GroundLevel", typeof(string)); |
|
2185 | 2186 |
pipeSystemNetworkDT.Columns.Add("AFC", typeof(string)); |
2186 | 2187 |
pipeSystemNetworkDT.Columns.Add("PUMP", typeof(string)); |
2187 | 2188 |
|
... | ... | |
2529 | 2530 |
{ |
2530 | 2531 |
LineNumber lineNumber = item.Document.LineNumbers.Find(x => x.UID == item.Owner); |
2531 | 2532 |
string FluidCode = string.Empty; |
2533 |
string GroundLevel = string.Empty; |
|
2532 | 2534 |
if (lineNumber != null) |
2533 | 2535 |
{ |
2534 | 2536 |
List<Attribute> att = lineNumber.Attributes; |
... | ... | |
2575 | 2577 |
newPipesystemRow["FLUID"] = FluidCode; |
2576 | 2578 |
newPipesystemRow["PMC"] = PMC; |
2577 | 2579 |
newPipesystemRow["PipeLineQty"] = string.Empty; |
2578 |
string GroundLevel = string.Empty; |
|
2580 |
|
|
2579 | 2581 |
if (!string.IsNullOrEmpty(FluidCode) && !string.IsNullOrEmpty(PMC)) |
2580 | 2582 |
{ |
2581 | 2583 |
FluidCodeGL = PSNFluidDT.Select(string.Format("Code = '{0}'", FluidCode)).FirstOrDefault().Field<string>("GroundLevel"); |
... | ... | |
2590 | 2592 |
newPipesystemRow["GroundLevel"] = GroundLevel; |
2591 | 2593 |
pipesystemDT.Rows.Add(newPipesystemRow); |
2592 | 2594 |
} |
2595 |
else |
|
2596 |
{ |
|
2597 |
GroundLevel = pipesystemDT.Select(string.Format("OID = '{0}'", PipeSystem_OID)).First().Field<string>("GroundLevel"); |
|
2598 |
} |
|
2593 | 2599 |
} |
2594 | 2600 |
} |
2595 | 2601 |
|
... | ... | |
2809 | 2815 |
|
2810 | 2816 |
newRow["EGTag"] = string.Empty; |
2811 | 2817 |
newRow["HasMLTags"] = "False"; |
2818 |
newRow["GroundLevel"] = GroundLevel; |
|
2812 | 2819 |
pipeSystemNetworkDT.Rows.Add(newRow); |
2813 | 2820 |
} |
2814 | 2821 |
} |
내보내기 Unified diff