개정판 e1377864
issue #0000
validation > PDF, 시스템 관리항목 삭제
- Main 리스트 컬럼 삭제
- Model 및 DB 삭제
- crud 수정
Change-Id: I668e4ec82b06fe070fa568e25d0900b5d129a729
ID2.Manager/ID2.Manager.Controller/Controllers/DocumentController.cs | ||
---|---|---|
106 | 106 |
AVEVAReviewDate = doc.AVEVAReviewDate, |
107 | 107 |
AVEVAStatus = doc.AVEVAStatus, |
108 | 108 |
AVEVAIssues = doc.AVEVAIssues, |
109 |
ReviewFilePath = doc.ReviewFilePath, |
|
110 |
ReviewFileName = doc.ReviewFileName, |
|
111 | 109 |
ProdReviewer = doc.ProdReviewer, |
112 | 110 |
ProdIsResult = doc.ProdIsResult, |
113 | 111 |
ProdRemarks = doc.ProdRemarks, |
ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs | ||
---|---|---|
388 | 388 |
,AVEVAReviewDate |
389 | 389 |
,AVEVAStatus |
390 | 390 |
,AVEVAIssues |
391 |
,ReviewFilePath |
|
392 |
,ReviewFileName |
|
393 | 391 |
,ProdReviewer |
394 | 392 |
,ProdIsResult |
395 | 393 |
,ProdRemarks |
... | ... | |
433 | 431 |
,@AVEVAReviewDate |
434 | 432 |
,@AVEVAStatus |
435 | 433 |
,@AVEVAIssues |
436 |
,@ReviewFilePath |
|
437 |
,@ReviewFileName |
|
438 | 434 |
,@ProdReviewer |
439 | 435 |
,@ProdIsResult |
440 | 436 |
,@ProdRemarks |
... | ... | |
489 | 485 |
,AVEVAReviewDate=@AVEVAReviewDate |
490 | 486 |
,AVEVAStatus=@AVEVAStatus |
491 | 487 |
,AVEVAIssues=@AVEVAIssues |
492 |
,ReviewFilePath=@ReviewFilePath |
|
493 |
,ReviewFileName=@ReviewFileName |
|
494 | 488 |
,ProdReviewer=@ProdReviewer |
495 | 489 |
,ProdIsResult=@ProdIsResult |
496 | 490 |
,ProdRemarks=@ProdRemarks |
ID2.Manager/ID2.Manager.Data/Models/Documents.cs | ||
---|---|---|
124 | 124 |
[DataMember] |
125 | 125 |
public string AVEVAIssues { get; set; } |
126 | 126 |
[DataMember] |
127 |
public string ReviewFilePath { get; set; } |
|
128 |
[DataMember] |
|
129 |
public string ReviewFileName { get; set; } |
|
130 |
[DataMember] |
|
131 | 127 |
public string ProdReviewer { get; set; } |
132 | 128 |
[DataMember] |
133 | 129 |
public string ProdIsResult { get; set; } |
... | ... | |
185 | 181 |
&& this.ID2StartDate == other.ID2StartDate && this.ID2EndDate == other.ID2EndDate && this.ID2Status == other.ID2Status |
186 | 182 |
&& this.ID2Issues == other.ID2Issues && this.ReplyModifications == other.ReplyModifications && this.ReplyRequester == other.ReplyRequester && this.IsConvert == other.IsConvert && this.AVEVAPersonInCharge == other.AVEVAPersonInCharge && this.AVEVAWorker == other.AVEVAWorker |
187 | 183 |
&& this.AVEVAConvertDate == other.AVEVAConvertDate && this.AVEVAReviewDate == other.AVEVAReviewDate |
188 |
&& this.AVEVAStatus == other.AVEVAStatus && this.AVEVAIssues == other.AVEVAIssues && this.ReviewFilePath == other.ReviewFilePath && this.ReviewFileName == other.ReviewFileName
|
|
184 |
&& this.AVEVAStatus == other.AVEVAStatus && this.AVEVAIssues == other.AVEVAIssues |
|
189 | 185 |
&& this.ProdReviewer == other.ProdReviewer && this.ProdIsResult == other.ProdIsResult && this.ProdRemarks == other.ProdRemarks && this.ClientReviewer == other.ClientReviewer |
190 | 186 |
&& this.ClientIsResult == other.ClientIsResult && this.ClientRemarks == other.ClientRemarks && this.DTIsGateWay == other.DTIsGateWay && this.DTIsImport == other.DTIsImport |
191 | 187 |
&& this.DTIsRegSystem == other.DTIsRegSystem && this.DTRemarks == other.DTRemarks |
... | ... | |
210 | 206 |
+ this.ID2StartDate.GetNullableHash() + this.ID2EndDate.GetNullableHash() + this.ID2Status.GetNullableHash() |
211 | 207 |
+ this.ID2Issues.GetNullableHash() + this.ReplyModifications.GetNullableHash() + this.ReplyRequester.GetNullableHash() + this.IsConvert.GetNullableHash() + this.AVEVAPersonInCharge.GetNullableHash() + this.AVEVAWorker.GetNullableHash() |
212 | 208 |
+ this.AVEVAConvertDate.GetNullableHash() + this.AVEVAReviewDate.GetNullableHash() |
213 |
+ this.AVEVAStatus.GetNullableHash() + this.AVEVAIssues.GetNullableHash() + this.ReviewFilePath.GetNullableHash() + this.ReviewFileName.GetNullableHash()
|
|
209 |
+ this.AVEVAStatus.GetNullableHash() + this.AVEVAIssues.GetNullableHash() |
|
214 | 210 |
+ this.ProdReviewer.GetNullableHash() + this.ProdIsResult.GetNullableHash() + this.ProdRemarks.GetNullableHash() + this.ClientReviewer.GetNullableHash() |
215 | 211 |
+ this.ClientIsResult.GetNullableHash() + this.ClientRemarks.GetNullableHash() + this.DTIsGateWay.GetNullableHash() + this.DTIsImport.GetNullableHash() |
216 | 212 |
+ this.DTIsRegSystem.GetNullableHash() + this.DTRemarks.GetNullableHash(); |
ID2.Manager/ID2.Manager/Main.Designer.cs | ||
---|---|---|
63 | 63 |
Telerik.WinControls.UI.GridViewDateTimeColumn gridViewDateTimeColumn4 = new Telerik.WinControls.UI.GridViewDateTimeColumn(); |
64 | 64 |
Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn14 = new Telerik.WinControls.UI.GridViewComboBoxColumn(); |
65 | 65 |
Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn9 = new Telerik.WinControls.UI.GridViewTextBoxColumn(); |
66 |
Telerik.WinControls.UI.GridViewCommandColumn gridViewCommandColumn6 = new Telerik.WinControls.UI.GridViewCommandColumn(); |
|
67 |
Telerik.WinControls.UI.GridViewCommandColumn gridViewCommandColumn7 = new Telerik.WinControls.UI.GridViewCommandColumn(); |
|
68 | 66 |
Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn15 = new Telerik.WinControls.UI.GridViewComboBoxColumn(); |
69 | 67 |
Telerik.WinControls.UI.GridViewComboBoxColumn gridViewComboBoxColumn16 = new Telerik.WinControls.UI.GridViewComboBoxColumn(); |
70 | 68 |
Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn10 = new Telerik.WinControls.UI.GridViewTextBoxColumn(); |
... | ... | |
480 | 478 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); |
481 | 479 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F)); |
482 | 480 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); |
483 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 88F));
|
|
481 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 90F));
|
|
484 | 482 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 2); |
485 | 483 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 2); |
486 | 484 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelFrReviewStatus, 3, 2); |
... | ... | |
1268 | 1266 |
gridViewTextBoxColumn9.HeaderText = "이슈사항"; |
1269 | 1267 |
gridViewTextBoxColumn9.Name = "AVEVAIssues"; |
1270 | 1268 |
gridViewTextBoxColumn9.Width = 150; |
1271 |
gridViewCommandColumn6.EnableExpressionEditor = false; |
|
1272 |
gridViewCommandColumn6.FieldName = "ReviewFileName"; |
|
1273 |
gridViewCommandColumn6.HeaderText = "PDF"; |
|
1274 |
gridViewCommandColumn6.Name = "ReviewFileName"; |
|
1275 |
gridViewCommandColumn6.Width = 70; |
|
1276 |
gridViewCommandColumn7.EnableExpressionEditor = false; |
|
1277 |
gridViewCommandColumn7.HeaderText = "시스템"; |
|
1278 |
gridViewCommandColumn7.Name = "SystemLink"; |
|
1279 |
gridViewCommandColumn7.Width = 70; |
|
1280 | 1269 |
gridViewComboBoxColumn15.EnableExpressionEditor = false; |
1281 | 1270 |
gridViewComboBoxColumn15.FieldName = "ProdReviewer"; |
1282 | 1271 |
gridViewComboBoxColumn15.HeaderText = "검토자"; |
... | ... | |
1373 | 1362 |
gridViewDateTimeColumn4, |
1374 | 1363 |
gridViewComboBoxColumn14, |
1375 | 1364 |
gridViewTextBoxColumn9, |
1376 |
gridViewCommandColumn6, |
|
1377 |
gridViewCommandColumn7, |
|
1378 | 1365 |
gridViewComboBoxColumn15, |
1379 | 1366 |
gridViewComboBoxColumn16, |
1380 | 1367 |
gridViewTextBoxColumn10, |
ID2.Manager/ID2.Manager/Main.cs | ||
---|---|---|
1319 | 1319 |
case "AVEVALink": |
1320 | 1320 |
MessageBox.Show($"{e.Column.Name} 실행"); |
1321 | 1321 |
break; |
1322 |
case "ReviewFileName"://일단주석 |
|
1323 |
MessageBox.Show($"{e.Column.Name} 실행"); |
|
1324 |
break; |
|
1325 |
case "SystemLink": |
|
1326 |
MessageBox.Show($"{e.Column.Name} 실행"); |
|
1327 |
break; |
|
1328 | 1322 |
case "ID2Connection": |
1329 | 1323 |
try |
1330 | 1324 |
{ |
... | ... | |
1449 | 1443 |
case "PDFLink": |
1450 | 1444 |
case "MarkupLink": |
1451 | 1445 |
case "AVEVALink": |
1452 |
case "ReviewFileName"://일단주석 |
|
1453 |
case "SystemLink": |
|
1454 | 1446 |
case "ID2Connection": |
1455 | 1447 |
this.GetCommandColBtnElement(e.CellElement.Children[0], e.CellElement.ColumnInfo.Name); |
1456 | 1448 |
break; |
... | ... | |
1537 | 1529 |
case "AVEVALink": |
1538 | 1530 |
bitmap = new Bitmap(Properties.Resources.aveva_net18); |
1539 | 1531 |
break; |
1540 |
case "ReviewFileName"://일단주석 |
|
1541 |
bitmap = new Bitmap(Properties.Resources.pdf18); |
|
1542 |
break; |
|
1543 |
case "SystemLink": |
|
1544 |
bitmap = new Bitmap(Properties.Resources.link18_yellow); |
|
1545 |
break; |
|
1546 | 1532 |
case "ID2Connection": |
1547 | 1533 |
bitmap = new Bitmap(Properties.Resources.id218); |
1548 | 1534 |
break; |
... | ... | |
1554 | 1540 |
case "PDFLink": |
1555 | 1541 |
case "MarkupLink": |
1556 | 1542 |
case "AVEVALink": |
1557 |
case "ReviewFileName"://일단주석 |
|
1558 |
case "SystemLink": |
|
1559 | 1543 |
case "ID2Connection": |
1560 | 1544 |
btnElem = (RadButtonElement)elem; |
1561 | 1545 |
btnElem.Margin = new Padding(0); |
... | ... | |
2278 | 2262 |
List<string> rvFrColNames = new List<string>() { "FrReviewStatus", "FrRemarks", "FrCreator", "FrCapture" }; |
2279 | 2263 |
List<string> wkID2ColNames = new List<string>() { "ID2StartDate", "ID2EndDate", "ID2Status", "ID2Issues", "ReplyModifications", "ReplyRequester", "IsConvert" }; |
2280 | 2264 |
List<string> wkAVEVAColNames = new List<string>() { "AVEVAConvertDate", "AVEVAReviewDate", "AVEVAStatus", "AVEVAIssues" }; |
2281 |
List<string> valLinkColNames = new List<string>() { "ReviewFileName", "SystemLink" }; |
|
2282 | 2265 |
List<string> valProdColNames = new List<string>() { "ProdReviewer", "ProdIsResult", "ProdRemarks", "ProdCapture" }; |
2283 | 2266 |
List<string> valCntColNames = new List<string>() { "ClientReviewer", "ClientIsResult", "ClientRemarks", "ClientCapture" }; |
2284 | 2267 |
List<string> dtColNames = new List<string>() { "DTIsGateWay", "DTIsImport", "DTIsRegSystem", "DTRemarks" }; |
... | ... | |
2333 | 2316 |
wkColGrp.Groups.Add(wkID2ColGrp); |
2334 | 2317 |
wkColGrp.Groups.Add(wkAVEVAColGrp); |
2335 | 2318 |
|
2336 |
|
|
2337 | 2319 |
//Validation |
2338 | 2320 |
GridViewColumnGroup valColGrp = new GridViewColumnGroup("Validation", "validation"); |
2339 |
GridViewColumnGroup valLinkColGrp = new GridViewColumnGroup("파일링크"); |
|
2340 | 2321 |
GridViewColumnGroup valProdColGrp = new GridViewColumnGroup("도프텍"); |
2341 | 2322 |
GridViewColumnGroup valCntColGrp = new GridViewColumnGroup("삼성전자"); |
2342 | 2323 |
|
2343 |
GridViewColumnGroupRow valLinkColGrpRow = new GridViewColumnGroupRow(); |
|
2344 |
valLinkColGrpRow.ColumnNames.AddRange(valLinkColNames); |
|
2345 |
|
|
2346 | 2324 |
GridViewColumnGroupRow valProdColGrpRow = new GridViewColumnGroupRow(); |
2347 | 2325 |
valProdColGrpRow.ColumnNames.AddRange(valProdColNames); |
2348 | 2326 |
|
2349 | 2327 |
GridViewColumnGroupRow valCntColGrpRow = new GridViewColumnGroupRow(); |
2350 | 2328 |
valCntColGrpRow.ColumnNames.AddRange(valCntColNames); |
2351 | 2329 |
|
2352 |
valLinkColGrp.Rows.Add(valLinkColGrpRow); |
|
2353 | 2330 |
valProdColGrp.Rows.Add(valProdColGrpRow); |
2354 | 2331 |
valCntColGrp.Rows.Add(valCntColGrpRow); |
2355 | 2332 |
|
2356 |
valColGrp.Groups.Add(valLinkColGrp); |
|
2357 | 2333 |
valColGrp.Groups.Add(valProdColGrp); |
2358 | 2334 |
valColGrp.Groups.Add(valCntColGrp); |
2359 | 2335 |
|
내보내기 Unified diff