개정판 61124f6c
issue #0000
Excel Import
- Project에 등록 안된 Project는 유효성 검사에서 체크되도록 수정
- UserList는 Information에서 가져오도록 수정
Change-Id: I8feec05315059a62a0f409b39aac842c2c25dab0
ID2.Manager/ID2.Manager.Common/Helpers/ID2Excel.cs | ||
---|---|---|
14 | 14 |
{ |
15 | 15 |
public class ID2Excel :IDisposable |
16 | 16 |
{ |
17 |
private List<UserInfo> UserlList = new List<UserInfo>(); |
|
18 |
|
|
17 |
readonly Informations informations = Informations.Instance; |
|
19 | 18 |
|
20 | 19 |
public void Dispose() |
21 | 20 |
{ |
... | ... | |
33 | 32 |
} |
34 | 33 |
} |
35 | 34 |
|
36 |
public ID2Excel(List<UserInfo> users) |
|
35 |
public ID2Excel() { } |
|
36 |
|
|
37 |
private ProjectInfo GetProject(string projectCode) |
|
37 | 38 |
{ |
38 |
UserlList = users; |
|
39 |
List<ProjectInfo> projects = informations.ProjectList.Where(x => x.GroupID.Equals(informations.ActiveProject.ProjectID)).ToList(); |
|
40 |
|
|
41 |
ProjectInfo projectInfo = projects.FirstOrDefault(x => x.Code.Equals(projectCode)); |
|
42 |
|
|
43 |
return projectInfo ?? new ProjectInfo(); |
|
39 | 44 |
} |
40 | 45 |
|
41 | 46 |
private UserInfo GetUser(string user) |
42 | 47 |
{ |
43 |
UserInfo userInfo = UserlList.Where(x => x.ID.Equals(user)).FirstOrDefault();
|
|
48 |
UserInfo userInfo = informations.UserList.Where(x => x.ID.Equals(user)).FirstOrDefault();
|
|
44 | 49 |
if (userInfo != null) return userInfo; |
45 | 50 |
|
46 |
userInfo = UserlList.Where(x => x.Name.Equals(user)).FirstOrDefault();
|
|
51 |
userInfo = informations.UserList.Where(x => x.Name.Equals(user)).FirstOrDefault();
|
|
47 | 52 |
if (userInfo != null) return userInfo; |
48 | 53 |
|
49 | 54 |
return userInfo ?? new UserInfo(); |
... | ... | |
178 | 183 |
switch (cell.COUMMN_INDEX) |
179 | 184 |
{ |
180 | 185 |
case 8: |
181 |
document.RefProjectCode = value;
|
|
186 |
document.RefProjectCode = this.GetProject(value).Code;
|
|
182 | 187 |
break; |
183 | 188 |
case 9: |
184 | 189 |
document.System = value; |
ID2.Manager/ID2.Manager/Main.cs | ||
---|---|---|
1739 | 1739 |
|
1740 | 1740 |
if (dialogResult == DialogResult.OK) |
1741 | 1741 |
{ |
1742 |
using (ID2Excel excel = new ID2Excel(informations.UserList.ToList()))
|
|
1742 |
using (ID2Excel excel = new ID2Excel()) |
|
1743 | 1743 |
{ |
1744 | 1744 |
var result = excel.ExcelDataImport(form.SelectItems); |
1745 | 1745 |
|
... | ... | |
1775 | 1775 |
//Error Message |
1776 | 1776 |
StringBuilder sbErrMsg = new StringBuilder(); |
1777 | 1777 |
|
1778 |
using(ID2Excel excel = new ID2Excel(informations.UserList.ToList()))
|
|
1778 |
using(ID2Excel excel = new ID2Excel()) |
|
1779 | 1779 |
{ |
1780 | 1780 |
var result = excel.GemboxImport(ofd.FileName); |
1781 | 1781 |
|
... | ... | |
1971 | 1971 |
|
1972 | 1972 |
if (this.documents.Any(x => string.IsNullOrEmpty(x.RefProjectCode))) |
1973 | 1973 |
{ |
1974 |
RadMessageBox.Show($"Please, Check the required value (Team).", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
1974 |
RadMessageBox.Show($"Please, check the required value (Team).", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
1975 | 1975 |
return; |
1976 | 1976 |
} |
1977 | 1977 |
|
1978 | 1978 |
if (this.documents.Any(x => string.IsNullOrEmpty(x.DocumentNo))) |
1979 | 1979 |
{ |
1980 |
RadMessageBox.Show($"Please, Check the required value (DWG_ID).", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
1980 |
RadMessageBox.Show($"Please, check the required value (DWG_ID).", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
1981 | 1981 |
return; |
1982 | 1982 |
} |
1983 | 1983 |
|
내보내기 Unified diff