개정판 3cc84cb6
issue #0000
ID2 이슈사항이 있을 경우 조회조건 추가
AVEVA 이슈사항이 있을 경우 조회조건 추가
Change-Id: I1c7383172d7560864c914d9fa8d0f25251a3d477
ID2.Manager/ID2.Manager.Controller/Controllers/DocumentController.cs | ||
---|---|---|
31 | 31 |
} |
32 | 32 |
} |
33 | 33 |
|
34 |
public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(string projectGroupID, List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem)
|
|
34 |
public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(string projectGroupID, List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string id2Issues, string avevaStatus, string avevaIssues, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem)
|
|
35 | 35 |
{ |
36 | 36 |
try |
37 | 37 |
{ |
38 | 38 |
using (DocumentRepository rep = new DocumentRepository(this._MSSQLCONNSTR)) |
39 | 39 |
{ |
40 |
return rep.GetDocuments(projectGroupID, dateTypes, frDate, toDate, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult, isGateWay, isRegSystem);
|
|
40 |
return rep.GetDocuments(projectGroupID, dateTypes, frDate, toDate, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, id2Issues, avevaStatus, avevaIssues, prodIsResult, clientIsResult, isGateWay, isRegSystem);
|
|
41 | 41 |
} |
42 | 42 |
} |
43 | 43 |
catch (Exception ex) |
... | ... | |
46 | 46 |
} |
47 | 47 |
} |
48 | 48 |
|
49 |
public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(List<ID2ProjectInfo> id2Infos, string projectGroupID, List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem)
|
|
49 |
public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(List<ID2ProjectInfo> id2Infos, string projectGroupID, List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Issues, string id2Status, string avevaStatus, string avevaIssues, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem)
|
|
50 | 50 |
{ |
51 | 51 |
try |
52 | 52 |
{ |
53 |
var (dwgs, totalCnt) = this.GetDocuments(projectGroupID, dateTypes, frDate, toDate, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult, isGateWay, isRegSystem);
|
|
53 |
var (dwgs, totalCnt) = this.GetDocuments(projectGroupID, dateTypes, frDate, toDate, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, id2Issues, avevaStatus, avevaIssues, prodIsResult, clientIsResult, isGateWay, isRegSystem);
|
|
54 | 54 |
|
55 | 55 |
IEnumerable<Documents> docs = dwgs; |
56 | 56 |
List<ID2Drawings> id2docs = null; |
ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs | ||
---|---|---|
58 | 58 |
} |
59 | 59 |
|
60 | 60 |
|
61 |
public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(string projectGroupID, List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem)
|
|
61 |
public (IEnumerable<Documents> dwgs, int totalCnt) GetDocuments(string projectGroupID, List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string id2Issues, string avevaStatus, string avevaIssues, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem)
|
|
62 | 62 |
{ |
63 | 63 |
var map = new CustomPropertyTypeMap(typeof(AttFileInfo), (type, columnName) |
64 | 64 |
=> type.GetProperties().FirstOrDefault(prop => GetDescriptionFromAttribute(prop) == columnName.ToLower())); |
... | ... | |
152 | 152 |
sbWhere.Append(" and doc.ID2Status=@ID2Status "); |
153 | 153 |
parameters.Add("ID2Status", id2Status); |
154 | 154 |
} |
155 |
|
|
156 |
if (!string.IsNullOrEmpty(id2Issues)) |
|
157 |
{ |
|
158 |
sbWhere.Append(" and (case when isnull(ltrim(rtrim(doc.ID2Issues)),'') = '' then 'No' else 'Yes' end)=@ID2Issues "); |
|
159 |
parameters.Add("ID2Issues", id2Issues); |
|
160 |
} |
|
161 |
|
|
155 | 162 |
if (!string.IsNullOrEmpty(avevaStatus)) |
156 | 163 |
{ |
157 | 164 |
sbWhere.Append(" and doc.AVEVAStatus=@AVEVAStatus "); |
158 | 165 |
parameters.Add("AVEVAStatus", avevaStatus); |
159 | 166 |
} |
160 | 167 |
|
168 |
if (!string.IsNullOrEmpty(avevaIssues)) |
|
169 |
{ |
|
170 |
sbWhere.Append(" and (case when isnull(ltrim(rtrim(doc.AVEVAIssues)),'') = '' then 'No' else 'Yes' end)=@AVEVAIssues "); |
|
171 |
parameters.Add("AVEVAIssues", avevaIssues); |
|
172 |
} |
|
173 |
|
|
161 | 174 |
if (!string.IsNullOrEmpty(prodIsResult)) |
162 | 175 |
{ |
163 | 176 |
sbWhere.Append(" and doc.ProdIsResult=@ProdIsResult "); |
... | ... | |
186 | 199 |
string query = $@" |
187 | 200 |
select doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime, |
188 | 201 |
files.[FileID] as FileID, files.*, |
189 |
markus.MARKUP_DATA_ID as MARKUP_DATA_ID, markus.*, |
|
190 |
datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime |
|
202 |
markus.MARKUP_DATA_ID as MARKUP_DATA_ID, markus.* |
|
191 | 203 |
from dbo.Documents doc |
192 | 204 |
LEFT OUTER JOIN AttachFIles files ON doc.DocID = fIles.RefID |
193 | 205 |
LEFT OUTER JOIN |
ID2.Manager/ID2.Manager/Classes/DocumentsWorker.cs | ||
---|---|---|
30 | 30 |
string IsToIsDiscussion { get; set; } |
31 | 31 |
string IsFrReviewStatus { get; set; } |
32 | 32 |
string IsID2Work { get; set; } |
33 |
string Id2Issues { get; set; } |
|
33 | 34 |
string Id2Status { get; set; } |
34 | 35 |
string AvevaStatus { get; set; } |
36 |
string AvevaIssues { get; set; } |
|
35 | 37 |
string ProdIsResult { get; set; } |
36 | 38 |
string ClientIsResult { get; set; } |
37 | 39 |
string DTIsGateWay { get; set; } |
38 | 40 |
string DTIsRegSystem { get; set; } |
39 | 41 |
|
40 |
public LoadDocumentsWorker(List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string avevaStatus, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem, Control parent = null) : base(parent)
|
|
42 |
public LoadDocumentsWorker(List<string> dateTypes, DateTime? frDate, DateTime? toDate, string projectCode, string personIncharge, string jobLevel, string documentNo, string isToIsDiscussion, string isFrReviewStatus, string isID2Work, string id2Status, string id2Issues, string avevaStatus, string avevaIssues, string prodIsResult, string clientIsResult, string isGateWay, string isRegSystem, Control parent = null) : base(parent)
|
|
41 | 43 |
{ |
42 | 44 |
this.DateTypes = dateTypes; |
43 | 45 |
this.FrDate = frDate; |
... | ... | |
50 | 52 |
this.IsFrReviewStatus = isFrReviewStatus; |
51 | 53 |
this.IsID2Work = isID2Work; |
52 | 54 |
this.Id2Status = id2Status; |
55 |
this.Id2Issues = id2Issues; |
|
53 | 56 |
this.AvevaStatus = avevaStatus; |
57 |
this.AvevaIssues = avevaIssues; |
|
54 | 58 |
this.ProdIsResult = prodIsResult; |
55 | 59 |
this.ClientIsResult = clientIsResult; |
56 | 60 |
this.DTIsGateWay = isGateWay; |
... | ... | |
61 | 65 |
{ |
62 | 66 |
try |
63 | 67 |
{ |
64 |
var (dwgs, totalCnt) = new DocumentController().GetDocuments(informations.ActiveProject.ProjectID, this.DateTypes, this.FrDate, this.ToDate, this.ProjectCode, this.PersonIncharge, this.JobLevel, this.DocumentNo, this.IsToIsDiscussion, this.IsFrReviewStatus, this.IsID2Work, this.Id2Status, this.AvevaStatus, this.ProdIsResult, this.ClientIsResult, this.DTIsGateWay, this.DTIsRegSystem);
|
|
68 |
var (dwgs, totalCnt) = new DocumentController().GetDocuments(informations.ActiveProject.ProjectID, this.DateTypes, this.FrDate, this.ToDate, this.ProjectCode, this.PersonIncharge, this.JobLevel, this.DocumentNo, this.IsToIsDiscussion, this.IsFrReviewStatus, this.IsID2Work, this.Id2Status, this.Id2Issues, this.AvevaStatus, this.AvevaIssues, this.ProdIsResult, this.ClientIsResult, this.DTIsGateWay, this.DTIsRegSystem);
|
|
65 | 69 |
e.Result = new DocumentsResult() { Dwgs = dwgs.ToList(), TotalCount = totalCnt }; |
66 | 70 |
} |
67 | 71 |
catch (Exception ex) |
ID2.Manager/ID2.Manager/Main.Designer.cs | ||
---|---|---|
181 | 181 |
this.DockValidation = new Telerik.WinControls.UI.Docking.DocumentWindow(); |
182 | 182 |
this.LayoutValidation = new System.Windows.Forms.TableLayoutPanel(); |
183 | 183 |
this.DockTabStripComment = new Telerik.WinControls.UI.Docking.ToolTabStrip(); |
184 |
this.radLabelID2Issues = new Telerik.WinControls.UI.RadLabel(); |
|
185 |
this.radLabelAVEVAIssues = new Telerik.WinControls.UI.RadLabel(); |
|
186 |
this.radDropDownListID2Issues = new Telerik.WinControls.UI.RadDropDownList(); |
|
187 |
this.radDropDownListAVEVAIssues = new Telerik.WinControls.UI.RadDropDownList(); |
|
184 | 188 |
((System.ComponentModel.ISupportInitialize)(this.ID2ManagerRadRibbonBar)).BeginInit(); |
185 | 189 |
((System.ComponentModel.ISupportInitialize)(this.radRibbonBarBackstageViewID2Manager)).BeginInit(); |
186 | 190 |
this.radRibbonBarBackstageViewID2Manager.SuspendLayout(); |
... | ... | |
251 | 255 |
this.DockValidation.SuspendLayout(); |
252 | 256 |
((System.ComponentModel.ISupportInitialize)(this.DockTabStripComment)).BeginInit(); |
253 | 257 |
this.DockTabStripComment.SuspendLayout(); |
258 |
((System.ComponentModel.ISupportInitialize)(this.radLabelID2Issues)).BeginInit(); |
|
259 |
((System.ComponentModel.ISupportInitialize)(this.radLabelAVEVAIssues)).BeginInit(); |
|
260 |
((System.ComponentModel.ISupportInitialize)(this.radDropDownListID2Issues)).BeginInit(); |
|
261 |
((System.ComponentModel.ISupportInitialize)(this.radDropDownListAVEVAIssues)).BeginInit(); |
|
254 | 262 |
((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); |
255 | 263 |
this.SuspendLayout(); |
256 | 264 |
// |
... | ... | |
475 | 483 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); |
476 | 484 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F)); |
477 | 485 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); |
478 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 75F));
|
|
486 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 76F));
|
|
479 | 487 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 2); |
480 | 488 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 2); |
481 | 489 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelFrReviewStatus, 3, 2); |
482 | 490 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelToIsDiscussion, 1, 2); |
483 | 491 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabel9, 1, 4); |
484 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelAVEVAStatus, 3, 3);
|
|
492 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelAVEVAStatus, 5, 3);
|
|
485 | 493 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelIsID2Work, 5, 2); |
486 | 494 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelJobLevel, 5, 1); |
487 | 495 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabel4, 0, 4); |
... | ... | |
500 | 508 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabel10, 3, 4); |
501 | 509 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListIsID2Work, 6, 2); |
502 | 510 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListID2Status, 2, 3); |
503 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListAVEVAStatus, 4, 3);
|
|
511 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListAVEVAStatus, 6, 3);
|
|
504 | 512 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListProdIsResult, 2, 4); |
505 | 513 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListClientIsResult, 4, 4); |
506 | 514 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabel6, 0, 5); |
... | ... | |
510 | 518 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListRegistration, 4, 5); |
511 | 519 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabel8, 0, 0); |
512 | 520 |
this.tableLayoutPanelCondition.Controls.Add(this.tableLayoutPanel1, 1, 0); |
521 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelID2Issues, 3, 3); |
|
522 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelAVEVAIssues, 7, 3); |
|
523 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListID2Issues, 4, 3); |
|
524 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListAVEVAIssues, 8, 3); |
|
513 | 525 |
this.tableLayoutPanelCondition.Dock = System.Windows.Forms.DockStyle.Fill; |
514 | 526 |
this.tableLayoutPanelCondition.Location = new System.Drawing.Point(13, 3); |
515 | 527 |
this.tableLayoutPanelCondition.Name = "tableLayoutPanelCondition"; |
... | ... | |
577 | 589 |
// |
578 | 590 |
this.radLabelAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); |
579 | 591 |
this.radLabelAVEVAStatus.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
580 |
this.radLabelAVEVAStatus.Location = new System.Drawing.Point(273, 90);
|
|
592 |
this.radLabelAVEVAStatus.Location = new System.Drawing.Point(486, 90);
|
|
581 | 593 |
this.radLabelAVEVAStatus.Name = "radLabelAVEVAStatus"; |
582 | 594 |
this.radLabelAVEVAStatus.Size = new System.Drawing.Size(86, 17); |
583 | 595 |
this.radLabelAVEVAStatus.TabIndex = 8; |
... | ... | |
768 | 780 |
this.radDropDownListAVEVAStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); |
769 | 781 |
this.radDropDownListAVEVAStatus.DropDownAnimationEnabled = true; |
770 | 782 |
this.radDropDownListAVEVAStatus.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; |
771 |
this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(359, 88);
|
|
783 |
this.radDropDownListAVEVAStatus.Location = new System.Drawing.Point(572, 88);
|
|
772 | 784 |
this.radDropDownListAVEVAStatus.Name = "radDropDownListAVEVAStatus"; |
773 | 785 |
this.radDropDownListAVEVAStatus.Size = new System.Drawing.Size(120, 20); |
774 | 786 |
this.radDropDownListAVEVAStatus.TabIndex = 14; |
... | ... | |
1566 | 1578 |
// |
1567 | 1579 |
// radPageViewPageAutoCAD |
1568 | 1580 |
// |
1581 |
this.radPageViewPageAutoCAD.ItemSize = new System.Drawing.SizeF(63F, 28F); |
|
1569 | 1582 |
this.radPageViewPageAutoCAD.Location = new System.Drawing.Point(10, 37); |
1570 | 1583 |
this.radPageViewPageAutoCAD.Name = "radPageViewPageAutoCAD"; |
1571 | 1584 |
this.radPageViewPageAutoCAD.Size = new System.Drawing.Size(258, 146); |
... | ... | |
1748 | 1761 |
this.DockTabStripComment.TabIndex = 4; |
1749 | 1762 |
this.DockTabStripComment.TabStop = false; |
1750 | 1763 |
// |
1764 |
// radLabelID2Issues |
|
1765 |
// |
|
1766 |
this.radLabelID2Issues.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
1767 |
this.radLabelID2Issues.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
1768 |
this.radLabelID2Issues.Location = new System.Drawing.Point(273, 90); |
|
1769 |
this.radLabelID2Issues.Name = "radLabelID2Issues"; |
|
1770 |
this.radLabelID2Issues.Size = new System.Drawing.Size(64, 17); |
|
1771 |
this.radLabelID2Issues.TabIndex = 23; |
|
1772 |
this.radLabelID2Issues.Text = "ID2 Issue"; |
|
1773 |
// |
|
1774 |
// radLabelAVEVAIssues |
|
1775 |
// |
|
1776 |
this.radLabelAVEVAIssues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); |
|
1777 |
this.radLabelAVEVAIssues.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); |
|
1778 |
this.radLabelAVEVAIssues.Location = new System.Drawing.Point(699, 90); |
|
1779 |
this.radLabelAVEVAIssues.Name = "radLabelAVEVAIssues"; |
|
1780 |
this.radLabelAVEVAIssues.Size = new System.Drawing.Size(81, 17); |
|
1781 |
this.radLabelAVEVAIssues.TabIndex = 24; |
|
1782 |
this.radLabelAVEVAIssues.Text = "AVEVA Issue"; |
|
1783 |
// |
|
1784 |
// radDropDownListID2Issues |
|
1785 |
// |
|
1786 |
this.radDropDownListID2Issues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); |
|
1787 |
this.radDropDownListID2Issues.DropDownAnimationEnabled = true; |
|
1788 |
this.radDropDownListID2Issues.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; |
|
1789 |
this.radDropDownListID2Issues.Location = new System.Drawing.Point(359, 88); |
|
1790 |
this.radDropDownListID2Issues.Name = "radDropDownListID2Issues"; |
|
1791 |
this.radDropDownListID2Issues.Size = new System.Drawing.Size(120, 20); |
|
1792 |
this.radDropDownListID2Issues.TabIndex = 25; |
|
1793 |
// |
|
1794 |
// radDropDownListAVEVAIssues |
|
1795 |
// |
|
1796 |
this.radDropDownListAVEVAIssues.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); |
|
1797 |
this.radDropDownListAVEVAIssues.DropDownAnimationEnabled = true; |
|
1798 |
this.radDropDownListAVEVAIssues.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList; |
|
1799 |
this.radDropDownListAVEVAIssues.Location = new System.Drawing.Point(785, 88); |
|
1800 |
this.radDropDownListAVEVAIssues.Name = "radDropDownListAVEVAIssues"; |
|
1801 |
this.radDropDownListAVEVAIssues.Size = new System.Drawing.Size(120, 20); |
|
1802 |
this.radDropDownListAVEVAIssues.TabIndex = 26; |
|
1803 |
// |
|
1751 | 1804 |
// Main |
1752 | 1805 |
// |
1753 | 1806 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); |
... | ... | |
1837 | 1890 |
this.DockValidation.ResumeLayout(false); |
1838 | 1891 |
((System.ComponentModel.ISupportInitialize)(this.DockTabStripComment)).EndInit(); |
1839 | 1892 |
this.DockTabStripComment.ResumeLayout(false); |
1893 |
((System.ComponentModel.ISupportInitialize)(this.radLabelID2Issues)).EndInit(); |
|
1894 |
((System.ComponentModel.ISupportInitialize)(this.radLabelAVEVAIssues)).EndInit(); |
|
1895 |
((System.ComponentModel.ISupportInitialize)(this.radDropDownListID2Issues)).EndInit(); |
|
1896 |
((System.ComponentModel.ISupportInitialize)(this.radDropDownListAVEVAIssues)).EndInit(); |
|
1840 | 1897 |
((System.ComponentModel.ISupportInitialize)(this)).EndInit(); |
1841 | 1898 |
this.ResumeLayout(false); |
1842 | 1899 |
this.PerformLayout(); |
... | ... | |
1948 | 2005 |
private Telerik.WinControls.UI.RadDateTimePicker radDateTimePickerTo; |
1949 | 2006 |
private Telerik.WinControls.UI.RadButton radButtonDateClear; |
1950 | 2007 |
private Telerik.WinControls.UI.RadLabel radLabelSplit; |
2008 |
private Telerik.WinControls.UI.RadLabel radLabelID2Issues; |
|
2009 |
private Telerik.WinControls.UI.RadLabel radLabelAVEVAIssues; |
|
2010 |
private Telerik.WinControls.UI.RadDropDownList radDropDownListID2Issues; |
|
2011 |
private Telerik.WinControls.UI.RadDropDownList radDropDownListAVEVAIssues; |
|
1951 | 2012 |
} |
1952 | 2013 |
} |
ID2.Manager/ID2.Manager/Main.cs | ||
---|---|---|
919 | 919 |
}); |
920 | 920 |
var allIsID2Work = new RadListDataItem("== 전체 ==", string.Empty); |
921 | 921 |
this.radDropDownListIsID2Work.Items.Insert(0, allIsID2Work); |
922 |
#endregion |
|
922 |
#endregion
|
|
923 | 923 |
|
924 |
#region 작업 |
|
924 |
#region 작업
|
|
925 | 925 |
//ID2 Status |
926 |
if (this.radDropDownListID2Status.Items.Count > 0) |
|
927 |
this.radDropDownListID2Status.Items.Clear(); |
|
928 |
informations.JobStatus.ForEach(x => |
|
929 | 926 |
{ |
930 |
this.radDropDownListID2Status.Items.Add(new RadListDataItem(x, x)); |
|
931 |
}); |
|
932 |
var allID2Status = new RadListDataItem("== 전체 ==", string.Empty); |
|
933 |
this.radDropDownListID2Status.Items.Insert(0, allID2Status); |
|
934 |
allID2Status.Selected = true; |
|
927 |
if (this.radDropDownListID2Status.Items.Count > 0) |
|
928 |
this.radDropDownListID2Status.Items.Clear(); |
|
929 |
informations.JobStatus.ForEach(x => |
|
930 |
{ |
|
931 |
this.radDropDownListID2Status.Items.Add(new RadListDataItem(x, x)); |
|
932 |
}); |
|
933 |
var allID2Status = new RadListDataItem("== 전체 ==", string.Empty); |
|
934 |
this.radDropDownListID2Status.Items.Insert(0, allID2Status); |
|
935 |
allID2Status.Selected = true; |
|
936 |
} |
|
937 |
|
|
938 |
//ID2 Issues |
|
939 |
{ |
|
940 |
if (this.radDropDownListID2Issues.Items.Count > 0) |
|
941 |
this.radDropDownListID2Issues.Items.Clear(); |
|
942 |
informations.IsYesNo.ForEach(x => |
|
943 |
{ |
|
944 |
this.radDropDownListID2Issues.Items.Add(new RadListDataItem(x, x)); |
|
945 |
}); |
|
946 |
var allID2Issues = new RadListDataItem("== 전체 ==", string.Empty); |
|
947 |
this.radDropDownListID2Issues.Items.Insert(0, allID2Issues); |
|
948 |
allID2Issues.Selected = true; |
|
949 |
} |
|
935 | 950 |
|
936 | 951 |
//AVEVA Status |
937 |
if (this.radDropDownListAVEVAStatus.Items.Count > 0) |
|
938 |
this.radDropDownListAVEVAStatus.Items.Clear(); |
|
939 |
informations.JobStatus.ForEach(x => |
|
940 | 952 |
{ |
941 |
this.radDropDownListAVEVAStatus.Items.Add(new RadListDataItem(x, x)); |
|
942 |
}); |
|
943 |
var allAVEVAStatus = new RadListDataItem("== 전체 ==", string.Empty); |
|
944 |
this.radDropDownListAVEVAStatus.Items.Insert(0, allAVEVAStatus); |
|
945 |
allAVEVAStatus.Selected = true; |
|
946 |
#endregion |
|
953 |
if (this.radDropDownListAVEVAStatus.Items.Count > 0) |
|
954 |
this.radDropDownListAVEVAStatus.Items.Clear(); |
|
955 |
informations.JobStatus.ForEach(x => |
|
956 |
{ |
|
957 |
this.radDropDownListAVEVAStatus.Items.Add(new RadListDataItem(x, x)); |
|
958 |
}); |
|
959 |
var allAVEVAStatus = new RadListDataItem("== 전체 ==", string.Empty); |
|
960 |
this.radDropDownListAVEVAStatus.Items.Insert(0, allAVEVAStatus); |
|
961 |
allAVEVAStatus.Selected = true; |
|
962 |
} |
|
963 |
|
|
964 |
//AVEVA Issues |
|
965 |
{ |
|
966 |
if (this.radDropDownListAVEVAIssues.Items.Count > 0) |
|
967 |
this.radDropDownListAVEVAIssues.Items.Clear(); |
|
968 |
informations.IsYesNo.ForEach(x => |
|
969 |
{ |
|
970 |
this.radDropDownListAVEVAIssues.Items.Add(new RadListDataItem(x, x)); |
|
971 |
}); |
|
972 |
var allAVEVAIssues = new RadListDataItem("== 전체 ==", string.Empty); |
|
973 |
this.radDropDownListAVEVAIssues.Items.Insert(0, allAVEVAIssues); |
|
974 |
allAVEVAIssues.Selected = true; |
|
975 |
} |
|
976 |
|
|
977 |
#endregion |
|
947 | 978 |
|
948 |
#region 검수 |
|
979 |
#region 검수
|
|
949 | 980 |
//도프텍 결과 |
950 | 981 |
if (this.radDropDownListProdIsResult.Items.Count > 0) |
951 | 982 |
this.radDropDownListProdIsResult.Items.Clear(); |
... | ... | |
1029 | 1060 |
string isID2Work = this.radDropDownListIsID2Work.SelectedValue.ToString(); |
1030 | 1061 |
|
1031 | 1062 |
string id2Status = this.radDropDownListID2Status.SelectedValue.ToString(); |
1063 |
string id2Issues = this.radDropDownListID2Issues.SelectedValue.ToString(); |
|
1032 | 1064 |
string avevaStatus = this.radDropDownListAVEVAStatus.SelectedValue.ToString(); |
1065 |
string avevaIssues = this.radDropDownListAVEVAIssues.SelectedValue.ToString(); |
|
1033 | 1066 |
|
1034 | 1067 |
string prodIsResult = this.radDropDownListProdIsResult.SelectedValue.ToString(); |
1035 | 1068 |
string clientIsResult = this.radDropDownListClientIsResult.SelectedValue.ToString(); |
... | ... | |
1037 | 1070 |
string isGateWay = this.radDropDownListGateway.SelectedValue.ToString(); |
1038 | 1071 |
string isRegSystem = this.radDropDownListRegistration.SelectedValue.ToString(); |
1039 | 1072 |
|
1040 |
var worker = new LoadDocumentsWorker(dateTypes, frDate, toDate, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, avevaStatus, prodIsResult, clientIsResult, isGateWay, isRegSystem, this.radGridViewDocuments);
|
|
1073 |
var worker = new LoadDocumentsWorker(dateTypes, frDate, toDate, projectCode, personIncharge, jobLevel, documentNo, isToIsDiscussion, isFrReviewStatus, isID2Work, id2Status, id2Issues, avevaStatus, avevaIssues, prodIsResult, clientIsResult, isGateWay, isRegSystem, this.radGridViewDocuments);
|
|
1041 | 1074 |
worker.OnWorkCompletedHandler += (e) => |
1042 | 1075 |
{ |
1043 | 1076 |
var docData = e.Result as DocumentsResult; |
내보내기 Unified diff