개정판 00d11333
issue #0000
CapturePath -> Capture 로 변경
Change-Id: Ia56c64dcab320fdd04f78ab368b7d3d299880361
ID2.Manager/ID2.Manager.Controller/Controllers/DocumentController.cs | ||
---|---|---|
67 | 67 |
ToIsDiscussion = doc.ToIsDiscussion, |
68 | 68 |
ToRemarks = doc.ToRemarks, |
69 | 69 |
ToCreator = doc.ToCreator, |
70 |
ToCapturePath = doc.ToCapturePath,
|
|
70 |
ToCapture = doc.ToCapture,
|
|
71 | 71 |
ToIsMarkup = doc.ToIsMarkup, |
72 | 72 |
FrReviewStatus = doc.FrReviewStatus, |
73 | 73 |
FrRemarks = doc.FrRemarks, |
74 | 74 |
FrCreator = doc.FrCreator, |
75 |
FrCapturePath = doc.FrCapturePath,
|
|
75 |
FrCapture = doc.FrCapture,
|
|
76 | 76 |
FrIsMarkup = doc.FrIsMarkup, |
77 | 77 |
IsID2Work = doc.IsID2Work, |
78 | 78 |
ID2Connection = doc.ID2Connection, |
ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs | ||
---|---|---|
144 | 144 |
,[ToIsDiscussion] |
145 | 145 |
,[ToRemarks] |
146 | 146 |
,[ToCreator] |
147 |
,[ToCapturePath]
|
|
147 |
,[ToCapture] |
|
148 | 148 |
,[ToIsMarkup] |
149 | 149 |
,[FrReviewStatus] |
150 | 150 |
,[FrRemarks] |
151 | 151 |
,[FrCreator] |
152 |
,[FrCapturePath]
|
|
152 |
,[FrCapture] |
|
153 | 153 |
,[FrIsMarkup] |
154 | 154 |
,[IsID2Work] |
155 | 155 |
,[ID2Connection] |
... | ... | |
190 | 190 |
,@ToIsDiscussion |
191 | 191 |
,@ToRemarks |
192 | 192 |
,@ToCreator |
193 |
,@ToCapturePath
|
|
193 |
,@ToCapture |
|
194 | 194 |
,@ToIsMarkup |
195 | 195 |
,@FrReviewStatus |
196 | 196 |
,@FrRemarks |
197 | 197 |
,@FrCreator |
198 |
,@FrCapturePath
|
|
198 |
,@FrCapture |
|
199 | 199 |
,@FrIsMarkup |
200 | 200 |
,@IsID2Work |
201 | 201 |
,@ID2Connection |
... | ... | |
239 | 239 |
,[ToIsDiscussion]=@ToIsDiscussion |
240 | 240 |
,[ToRemarks]=@ToRemarks |
241 | 241 |
,[ToCreator]=@ToCreator |
242 |
,[ToCapturePath]=@ToCapturePath
|
|
242 |
,[ToCapture]=@ToCapture
|
|
243 | 243 |
,[ToIsMarkup]=@ToIsMarkup |
244 | 244 |
,[FrReviewStatus]=@FrReviewStatus |
245 | 245 |
,[FrRemarks]=@FrRemarks |
246 | 246 |
,[FrCreator]=@FrCreator |
247 |
,[FrCapturePath]=@FrCapturePath
|
|
247 |
,[FrCapture]=@FrCapture
|
|
248 | 248 |
,[FrIsMarkup]=@FrIsMarkup |
249 | 249 |
,[IsID2Work]=@IsID2Work |
250 | 250 |
,[ID2Connection]=@ID2Connection |
ID2.Manager/ID2.Manager.Data/Models/Documents.cs | ||
---|---|---|
56 | 56 |
[DataMember] |
57 | 57 |
public string ToCreator { get; set; } |
58 | 58 |
[DataMember] |
59 |
public string ToCapturePath { get; set; }
|
|
59 |
public string ToCapture { get; set; } |
|
60 | 60 |
[DataMember] |
61 | 61 |
public string ToIsMarkup { get; set; } |
62 | 62 |
[DataMember] |
... | ... | |
66 | 66 |
[DataMember] |
67 | 67 |
public string FrCreator { get; set; } |
68 | 68 |
[DataMember] |
69 |
public string FrCapturePath { get; set; }
|
|
69 |
public string FrCapture { get; set; } |
|
70 | 70 |
[DataMember] |
71 | 71 |
public string FrIsMarkup { get; set; } |
72 | 72 |
[DataMember] |
... | ... | |
131 | 131 |
&& this.AutoCADFilie == other.AutoCADFilie && this.PDFFile == other.PDFFile && this.MarkupLink == other.MarkupLink && this.AVEVALink == other.AVEVALink |
132 | 132 |
&& this.DocFilePath == other.DocFilePath && this.DocFileName == other.DocFileName && this.JobLevel == other.JobLevel && this.IsTypical == other.IsTypical |
133 | 133 |
&& this.PersonInCharge == other.PersonInCharge && this.IsDeleted == other.IsDeleted && this.ToIsDiscussion == other.ToIsDiscussion && this.ToRemarks == other.ToRemarks |
134 |
&& this.ToCreator == other.ToCreator && this.ToCapturePath == other.ToCapturePath && this.ToIsMarkup == other.ToIsMarkup
|
|
134 |
&& this.ToCreator == other.ToCreator && this.ToCapture == other.ToCapture && this.ToIsMarkup == other.ToIsMarkup
|
|
135 | 135 |
&& this.FrReviewStatus == other.FrReviewStatus && this.FrRemarks == other.FrRemarks && this.FrCreator == other.FrCreator |
136 |
&& this.FrCapturePath == other.FrCapturePath && this.FrIsMarkup == other.FrIsMarkup && this.IsID2Work == other.IsID2Work && this.ID2Connection == other.ID2Connection
|
|
136 |
&& this.FrCapture == other.FrCapture && this.FrIsMarkup == other.FrIsMarkup && this.IsID2Work == other.IsID2Work && this.ID2Connection == other.ID2Connection
|
|
137 | 137 |
&& this.ID2StartDate == other.ID2StartDate && this.ID2EndDate == other.ID2EndDate && this.ID2JobTime == other.ID2JobTime && this.ID2Status == other.ID2Status |
138 | 138 |
&& this.ID2Issues == other.ID2Issues && this.AVEVAConnection == other.AVEVAConnection && this.AVEVAConvertDate == other.AVEVAConvertDate && this.AVEVAReviewDate == other.AVEVAReviewDate |
139 | 139 |
&& this.AVEVAStatus == other.AVEVAStatus && this.AVEVAIssues == other.AVEVAIssues && this.ReviewFilePath == other.ReviewFilePath && this.ReviewFileName == other.ReviewFileName |
... | ... | |
149 | 149 |
+ this.AutoCADFilie.GetHashCode() + this.PDFFile.GetHashCode() + this.MarkupLink.GetHashCode() + this.AVEVALink.GetHashCode() |
150 | 150 |
+ this.DocFilePath.GetHashCode() + this.DocFileName.GetHashCode() + this.JobLevel.GetHashCode() + this.IsTypical.GetHashCode() |
151 | 151 |
+ this.PersonInCharge.GetHashCode() + this.IsDeleted.GetHashCode() + this.ToIsDiscussion.GetHashCode() + this.ToRemarks.GetHashCode() |
152 |
+ this.ToCreator.GetHashCode() + this.ToCapturePath.GetHashCode() + this.ToIsMarkup.GetHashCode()
|
|
152 |
+ this.ToCreator.GetHashCode() + this.ToCapture.GetHashCode() + this.ToIsMarkup.GetHashCode() |
|
153 | 153 |
+ this.FrReviewStatus.GetHashCode() + this.FrRemarks.GetHashCode() + this.FrCreator.GetHashCode() |
154 |
+ this.FrCapturePath.GetHashCode() + this.FrIsMarkup.GetHashCode() + this.IsID2Work.GetHashCode() + this.ID2Connection.GetHashCode()
|
|
154 |
+ this.FrCapture.GetHashCode() + this.FrIsMarkup.GetHashCode() + this.IsID2Work.GetHashCode() + this.ID2Connection.GetHashCode() |
|
155 | 155 |
+ this.ID2StartDate.GetHashCode() + this.ID2EndDate.GetHashCode() + this.ID2JobTime.GetHashCode() + this.ID2Status.GetHashCode() |
156 | 156 |
+ this.ID2Issues.GetHashCode() + this.AVEVAConnection.GetHashCode() + this.AVEVAConvertDate.GetHashCode() + this.AVEVAReviewDate.GetHashCode() |
157 | 157 |
+ this.AVEVAStatus.GetHashCode() + this.AVEVAIssues.GetHashCode() + this.ReviewFilePath.GetHashCode() + this.ReviewFileName.GetHashCode() |
ID2.Manager/ID2.Manager/Main.Designer.cs | ||
---|---|---|
945 | 945 |
gridViewComboBoxColumn26.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; |
946 | 946 |
gridViewComboBoxColumn26.Width = 100; |
947 | 947 |
gridViewCommandColumn15.EnableExpressionEditor = false; |
948 |
gridViewCommandColumn15.FieldName = "ToCapturePath";
|
|
948 |
gridViewCommandColumn15.FieldName = "ToCapture"; |
|
949 | 949 |
gridViewCommandColumn15.HeaderText = "캡쳐"; |
950 |
gridViewCommandColumn15.Name = "ToCapturePath";
|
|
950 |
gridViewCommandColumn15.Name = "ToCapture"; |
|
951 | 951 |
gridViewCommandColumn15.Width = 70; |
952 | 952 |
gridViewComboBoxColumn27.EnableExpressionEditor = false; |
953 | 953 |
gridViewComboBoxColumn27.FieldName = "ToIsMarkup"; |
... | ... | |
973 | 973 |
gridViewComboBoxColumn29.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; |
974 | 974 |
gridViewComboBoxColumn29.Width = 100; |
975 | 975 |
gridViewCommandColumn16.EnableExpressionEditor = false; |
976 |
gridViewCommandColumn16.FieldName = "FrCapturePath";
|
|
976 |
gridViewCommandColumn16.FieldName = "FrCapture"; |
|
977 | 977 |
gridViewCommandColumn16.HeaderText = "캡쳐"; |
978 |
gridViewCommandColumn16.Name = "FrCapturePath";
|
|
978 |
gridViewCommandColumn16.Name = "FrCapture"; |
|
979 | 979 |
gridViewCommandColumn16.Width = 70; |
980 | 980 |
gridViewComboBoxColumn30.EnableExpressionEditor = false; |
981 | 981 |
gridViewComboBoxColumn30.FieldName = "FrIsMarkup"; |
ID2.Manager/ID2.Manager/Main.cs | ||
---|---|---|
728 | 728 |
case "SystemLink": |
729 | 729 |
MessageBox.Show($"{e.Column.Name} 실행"); |
730 | 730 |
break; |
731 |
case "ToCapturePath":
|
|
732 |
case "FrCapturePath":
|
|
731 |
case "ToCapture": |
|
732 |
case "FrCapture": |
|
733 | 733 |
|
734 | 734 |
if (e.Row.DataBoundItem is Documents dd) |
735 | 735 |
{ |
... | ... | |
868 | 868 |
case "AVEVAConnection": |
869 | 869 |
case "ReviewFileName"://일단주석 |
870 | 870 |
case "SystemLink": |
871 |
case "ToCapturePath":
|
|
872 |
case "FrCapturePath":
|
|
871 |
case "ToCapture": |
|
872 |
case "FrCapture": |
|
873 | 873 |
case "ID2Connection": |
874 | 874 |
this.GetCommandColBtnElement(e.CellElement.Children[0], e.CellElement.ColumnInfo.Name); |
875 | 875 |
break; |
... | ... | |
937 | 937 |
case "SystemLink": |
938 | 938 |
bitmap = new Bitmap(Properties.Resources.link18_yellow); |
939 | 939 |
break; |
940 |
case "ToCapturePath":
|
|
941 |
case "FrCapturePath":
|
|
940 |
case "ToCapture": |
|
941 |
case "FrCapture": |
|
942 | 942 |
bitmap = new Bitmap(Properties.Resources.files18); |
943 | 943 |
break; |
944 | 944 |
case "ID2Connection": |
... | ... | |
955 | 955 |
case "AVEVAConnection": |
956 | 956 |
case "ReviewFileName"://일단주석 |
957 | 957 |
case "SystemLink": |
958 |
case "ToCapturePath":
|
|
959 |
case "FrCapturePath":
|
|
958 |
case "ToCapture": |
|
959 |
case "FrCapture": |
|
960 | 960 |
case "ID2Connection": |
961 | 961 |
btnElem = (RadButtonElement)elem; |
962 | 962 |
btnElem.Margin = new Padding(0); |
... | ... | |
1098 | 1098 |
ToIsDiscussion = ws.Rows[p.Index].Cells[11].Value == null ? string.Empty : ws.Rows[p.Index].Cells[11].Value.ToString(), |
1099 | 1099 |
ToRemarks = ws.Rows[p.Index].Cells[12].Value == null ? string.Empty : ws.Rows[p.Index].Cells[12].Value.ToString(), |
1100 | 1100 |
ToCreator = ws.Rows[p.Index].Cells[13].Value == null ? string.Empty : this.GetUser(ws.Rows[p.Index].Cells[13].Value.ToString()).ID, |
1101 |
//ToCapturePath = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(),
|
|
1101 |
//ToCapture = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(), |
|
1102 | 1102 |
//ToIsMarkup = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(), |
1103 | 1103 |
FrReviewStatus = ws.Rows[p.Index].Cells[16].Value == null ? string.Empty : ws.Rows[p.Index].Cells[16].Value.ToString(), |
1104 | 1104 |
FrRemarks = ws.Rows[p.Index].Cells[17].Value == null ? string.Empty : ws.Rows[p.Index].Cells[17].Value.ToString(), |
1105 | 1105 |
FrCreator = ws.Rows[p.Index].Cells[18].Value == null ? string.Empty : this.GetUser(ws.Rows[p.Index].Cells[18].Value.ToString()).ID, |
1106 |
//FrCapturePath = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(),
|
|
1106 |
//FrCapture = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(), |
|
1107 | 1107 |
//FrIsMarkup = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(), |
1108 | 1108 |
IsID2Work = ws.Rows[p.Index].Cells[21].Value == null ? string.Empty : ws.Rows[p.Index].Cells[21].Value.ToString(), |
1109 | 1109 |
//ID2Connection = ws.Rows[p.Index].Cells[5].Value == null ? string.Empty : ws.Rows[p.Index].Cells[5].Value.ToString(), |
... | ... | |
1207 | 1207 |
templateWorksheet.Cells[rowIndex, 11].Value = doc.ToIsDiscussion; |
1208 | 1208 |
templateWorksheet.Cells[rowIndex, 12].Value = doc.ToRemarks; |
1209 | 1209 |
templateWorksheet.Cells[rowIndex, 13].Value = this.GetUser(doc.ToCreator).Name; |
1210 |
templateWorksheet.Cells[rowIndex, 14].Value = doc.ToCapturePath;
|
|
1210 |
templateWorksheet.Cells[rowIndex, 14].Value = doc.ToCapture; |
|
1211 | 1211 |
templateWorksheet.Cells[rowIndex, 15].Value = doc.ToIsMarkup; |
1212 | 1212 |
templateWorksheet.Cells[rowIndex, 16].Value = doc.FrReviewStatus; |
1213 | 1213 |
templateWorksheet.Cells[rowIndex, 17].Value = doc.FrRemarks; |
1214 | 1214 |
templateWorksheet.Cells[rowIndex, 18].Value = this.GetUser(doc.FrCreator).Name; |
1215 |
templateWorksheet.Cells[rowIndex, 19].Value = doc.FrCapturePath;
|
|
1215 |
templateWorksheet.Cells[rowIndex, 19].Value = doc.FrCapture; |
|
1216 | 1216 |
templateWorksheet.Cells[rowIndex, 20].Value = doc.FrIsMarkup; |
1217 | 1217 |
templateWorksheet.Cells[rowIndex, 21].Value = doc.IsID2Work; |
1218 | 1218 |
templateWorksheet.Cells[rowIndex, 22].Value = doc.ID2Connection; |
... | ... | |
1307 | 1307 |
|
1308 | 1308 |
List<string> docLinkColNames = new List<string>() { "AutoCADLink", "PDFLink", "MarkupLink", "AVEVALink" }; |
1309 | 1309 |
List<string> docInfoColNames = new List<string>() { "RefProjectCode", "DocumentNo", "PersonInCharge", "JobLevel", "IsTypical", "RevisonNo" }; |
1310 |
List<string> rvToColNames = new List<string>() { "ToIsDiscussion", "ToRemarks", "ToCreator", "ToCapturePath", "ToIsMarkup" };
|
|
1311 |
List<string> rvFrColNames = new List<string>() { "FrReviewStatus", "FrRemarks", "FrCreator", "FrCapturePath", "FrIsMarkup" };
|
|
1310 |
List<string> rvToColNames = new List<string>() { "ToIsDiscussion", "ToRemarks", "ToCreator", "ToCapture", "ToIsMarkup" }; |
|
1311 |
List<string> rvFrColNames = new List<string>() { "FrReviewStatus", "FrRemarks", "FrCreator", "FrCapture", "FrIsMarkup" }; |
|
1312 | 1312 |
List<string> rvEtcColNames = new List<string>() { "IsID2Work" }; |
1313 | 1313 |
List<string> wkID2ColNames = new List<string>() { "ID2Connection", "ID2StartDate", "ID2EndDate", "ID2JobTime", "ID2Status", "ID2Issues" }; |
1314 | 1314 |
List<string> wkAVEVAColNames = new List<string>() { "AVEVAConnection", "AVEVAConvertDate", "AVEVAReviewDate", "AVEVAStatus", "AVEVAIssues" }; |
내보내기 Unified diff