개정판 00837e19
issue #0000
group view 위치 변경
- 검토, 작업 => 작업, 검토
Project Manager
- 삭제버튼 추가
- Admin, Manager 일 경우에만 Project Manager 탭 보이도록 권한 수정
Change-Id: I276804553c4cc4a5d29c87b3b28095dfd25092f7
| ID2.Manager/ID2.Manager/Main.Designer.cs | ||
|---|---|---|
| 149 | 149 |
this.radLabelGroupVIew = new Telerik.WinControls.UI.RadLabel(); |
| 150 | 150 |
this.radCheckBox4 = new Telerik.WinControls.UI.RadCheckBox(); |
| 151 | 151 |
this.radCheckBox3 = new Telerik.WinControls.UI.RadCheckBox(); |
| 152 |
this.radCheckBox2 = new Telerik.WinControls.UI.RadCheckBox(); |
|
| 153 | 152 |
this.radCheckBox1 = new Telerik.WinControls.UI.RadCheckBox(); |
| 153 |
this.radCheckBox2 = new Telerik.WinControls.UI.RadCheckBox(); |
|
| 154 | 154 |
this.tableLayoutMain = new System.Windows.Forms.TableLayoutPanel(); |
| 155 | 155 |
this.radGridViewDocuments = new Telerik.WinControls.UI.RadGridView(); |
| 156 | 156 |
this.radCommandBar1 = new Telerik.WinControls.UI.RadCommandBar(); |
| ... | ... | |
| 184 | 184 |
this.DockValidation = new Telerik.WinControls.UI.Docking.DocumentWindow(); |
| 185 | 185 |
this.LayoutValidation = new System.Windows.Forms.TableLayoutPanel(); |
| 186 | 186 |
this.DockTabStripComment = new Telerik.WinControls.UI.Docking.ToolTabStrip(); |
| 187 |
this.radRibbonBarGroup2 = new Telerik.WinControls.UI.RadRibbonBarGroup(); |
|
| 188 |
this.radButtonElementDelete = new Telerik.WinControls.UI.RadButtonElement(); |
|
| 187 | 189 |
((System.ComponentModel.ISupportInitialize)(this.ID2ManagerRadRibbonBar)).BeginInit(); |
| 188 | 190 |
((System.ComponentModel.ISupportInitialize)(this.radRibbonBarBackstageViewID2Manager)).BeginInit(); |
| 189 | 191 |
this.radRibbonBarBackstageViewID2Manager.SuspendLayout(); |
| ... | ... | |
| 234 | 236 |
((System.ComponentModel.ISupportInitialize)(this.radLabelGroupVIew)).BeginInit(); |
| 235 | 237 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox4)).BeginInit(); |
| 236 | 238 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox3)).BeginInit(); |
| 237 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox2)).BeginInit(); |
|
| 238 | 239 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox1)).BeginInit(); |
| 240 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox2)).BeginInit(); |
|
| 239 | 241 |
this.tableLayoutMain.SuspendLayout(); |
| 240 | 242 |
((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments)).BeginInit(); |
| 241 | 243 |
((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments.MasterTemplate)).BeginInit(); |
| ... | ... | |
| 329 | 331 |
// |
| 330 | 332 |
// ribbonTabHome |
| 331 | 333 |
// |
| 332 |
this.ribbonTabHome.IsSelected = true;
|
|
| 334 |
this.ribbonTabHome.IsSelected = false;
|
|
| 333 | 335 |
this.ribbonTabHome.Items.AddRange(new Telerik.WinControls.RadItem[] {
|
| 334 | 336 |
this.radRibbonBarGroupDWG, |
| 335 | 337 |
this.radRibbonBarGroup1, |
| ... | ... | |
| 399 | 401 |
// |
| 400 | 402 |
// ribbonTabProjMgt |
| 401 | 403 |
// |
| 402 |
this.ribbonTabProjMgt.IsSelected = false;
|
|
| 404 |
this.ribbonTabProjMgt.IsSelected = true;
|
|
| 403 | 405 |
this.ribbonTabProjMgt.Items.AddRange(new Telerik.WinControls.RadItem[] {
|
| 404 |
this.radRibbonBarGroupExcel}); |
|
| 406 |
this.radRibbonBarGroupExcel, |
|
| 407 |
this.radRibbonBarGroup2}); |
|
| 405 | 408 |
this.ribbonTabProjMgt.Name = "ribbonTabProjMgt"; |
| 406 | 409 |
this.ribbonTabProjMgt.Text = "Project Manager"; |
| 407 | 410 |
this.ribbonTabProjMgt.UseMnemonic = false; |
| ... | ... | |
| 480 | 483 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); |
| 481 | 484 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F)); |
| 482 | 485 |
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, 73F));
|
|
| 486 |
this.tableLayoutPanelCondition.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 74F));
|
|
| 484 | 487 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListFrReviewStatus, 4, 2); |
| 485 | 488 |
this.tableLayoutPanelCondition.Controls.Add(this.radDropDownListToIsDiscussion, 2, 2); |
| 486 | 489 |
this.tableLayoutPanelCondition.Controls.Add(this.radLabelFrReviewStatus, 3, 2); |
| ... | ... | |
| 1013 | 1016 |
this.radCheckBox3.Text = "Validation"; |
| 1014 | 1017 |
this.radCheckBox3.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; |
| 1015 | 1018 |
// |
| 1016 |
// radCheckBox2 |
|
| 1017 |
// |
|
| 1018 |
this.radCheckBox2.Anchor = System.Windows.Forms.AnchorStyles.Top; |
|
| 1019 |
this.radCheckBox2.CheckState = System.Windows.Forms.CheckState.Checked; |
|
| 1020 |
this.radCheckBox2.Location = new System.Drawing.Point(115, 4); |
|
| 1021 |
this.radCheckBox2.Name = "radCheckBox2"; |
|
| 1022 |
this.radCheckBox2.Size = new System.Drawing.Size(43, 18); |
|
| 1023 |
this.radCheckBox2.TabIndex = 1; |
|
| 1024 |
this.radCheckBox2.Tag = "work"; |
|
| 1025 |
this.radCheckBox2.Text = "작업"; |
|
| 1026 |
this.radCheckBox2.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; |
|
| 1027 |
// |
|
| 1028 | 1019 |
// radCheckBox1 |
| 1029 | 1020 |
// |
| 1030 | 1021 |
this.radCheckBox1.Anchor = System.Windows.Forms.AnchorStyles.Top; |
| ... | ... | |
| 1037 | 1028 |
this.radCheckBox1.Text = "검토"; |
| 1038 | 1029 |
this.radCheckBox1.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; |
| 1039 | 1030 |
// |
| 1031 |
// radCheckBox2 |
|
| 1032 |
// |
|
| 1033 |
this.radCheckBox2.Anchor = System.Windows.Forms.AnchorStyles.Top; |
|
| 1034 |
this.radCheckBox2.CheckState = System.Windows.Forms.CheckState.Checked; |
|
| 1035 |
this.radCheckBox2.Location = new System.Drawing.Point(115, 4); |
|
| 1036 |
this.radCheckBox2.Name = "radCheckBox2"; |
|
| 1037 |
this.radCheckBox2.Size = new System.Drawing.Size(43, 18); |
|
| 1038 |
this.radCheckBox2.TabIndex = 1; |
|
| 1039 |
this.radCheckBox2.Tag = "work"; |
|
| 1040 |
this.radCheckBox2.Text = "작업"; |
|
| 1041 |
this.radCheckBox2.ToggleState = Telerik.WinControls.Enumerations.ToggleState.On; |
|
| 1042 |
// |
|
| 1040 | 1043 |
// tableLayoutMain |
| 1041 | 1044 |
// |
| 1042 | 1045 |
this.tableLayoutMain.ColumnCount = 2; |
| ... | ... | |
| 1595 | 1598 |
// |
| 1596 | 1599 |
// radPageViewPageAutoCAD |
| 1597 | 1600 |
// |
| 1598 |
this.radPageViewPageAutoCAD.ItemSize = new System.Drawing.SizeF(63F, 28F); |
|
| 1599 | 1601 |
this.radPageViewPageAutoCAD.Location = new System.Drawing.Point(10, 37); |
| 1600 | 1602 |
this.radPageViewPageAutoCAD.Name = "radPageViewPageAutoCAD"; |
| 1601 | 1603 |
this.radPageViewPageAutoCAD.Size = new System.Drawing.Size(258, 146); |
| ... | ... | |
| 1778 | 1780 |
this.DockTabStripComment.TabIndex = 4; |
| 1779 | 1781 |
this.DockTabStripComment.TabStop = false; |
| 1780 | 1782 |
// |
| 1783 |
// radRibbonBarGroup2 |
|
| 1784 |
// |
|
| 1785 |
this.radRibbonBarGroup2.Items.AddRange(new Telerik.WinControls.RadItem[] {
|
|
| 1786 |
this.radButtonElementDelete}); |
|
| 1787 |
this.radRibbonBarGroup2.Name = "radRibbonBarGroup2"; |
|
| 1788 |
this.radRibbonBarGroup2.Text = "Delete"; |
|
| 1789 |
// |
|
| 1790 |
// radButtonElementDelete |
|
| 1791 |
// |
|
| 1792 |
this.radButtonElementDelete.Name = "radButtonElementDelete"; |
|
| 1793 |
this.radButtonElementDelete.Text = "<html> DWG <p> Delete </html>"; |
|
| 1794 |
// |
|
| 1781 | 1795 |
// Main |
| 1782 | 1796 |
// |
| 1783 | 1797 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); |
| ... | ... | |
| 1846 | 1860 |
((System.ComponentModel.ISupportInitialize)(this.radLabelGroupVIew)).EndInit(); |
| 1847 | 1861 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox4)).EndInit(); |
| 1848 | 1862 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox3)).EndInit(); |
| 1849 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox2)).EndInit(); |
|
| 1850 | 1863 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox1)).EndInit(); |
| 1864 |
((System.ComponentModel.ISupportInitialize)(this.radCheckBox2)).EndInit(); |
|
| 1851 | 1865 |
this.tableLayoutMain.ResumeLayout(false); |
| 1852 | 1866 |
this.tableLayoutMain.PerformLayout(); |
| 1853 | 1867 |
((System.ComponentModel.ISupportInitialize)(this.radGridViewDocuments.MasterTemplate)).EndInit(); |
| ... | ... | |
| 1982 | 1996 |
private Telerik.WinControls.UI.RadLabel radLabelAVEVAIssues; |
| 1983 | 1997 |
private Telerik.WinControls.UI.RadDropDownList radDropDownListID2Issues; |
| 1984 | 1998 |
private Telerik.WinControls.UI.RadDropDownList radDropDownListAVEVAIssues; |
| 1999 |
private Telerik.WinControls.UI.RadRibbonBarGroup radRibbonBarGroup2; |
|
| 2000 |
private Telerik.WinControls.UI.RadButtonElement radButtonElementDelete; |
|
| 1985 | 2001 |
} |
| 1986 | 2002 |
} |
| ID2.Manager/ID2.Manager/Main.cs | ||
|---|---|---|
| 637 | 637 |
this.backstageViewPageOpenProject.Controls[0].Visible = true; |
| 638 | 638 |
this.backstageTabItemOpenProject.Visibility = ElementVisibility.Visible; |
| 639 | 639 |
this.backstageButtonItemUserRegistration.Visibility = ElementVisibility.Visible; |
| 640 |
|
|
| 641 |
this.ribbonTabProjMgt.Visibility = ElementVisibility.Visible; |
|
| 640 | 642 |
} |
| 641 | 643 |
else |
| 642 | 644 |
{
|
| ... | ... | |
| 655 | 657 |
} |
| 656 | 658 |
this.backstageTabItemOpenProject.Visibility = ElementVisibility.Collapsed; |
| 657 | 659 |
this.backstageButtonItemUserRegistration.Visibility = ElementVisibility.Collapsed; |
| 660 |
|
|
| 661 |
this.ribbonTabProjMgt.Visibility = ElementVisibility.Collapsed; |
|
| 658 | 662 |
} |
| 659 | 663 |
} |
| 660 | 664 |
else |
| ... | ... | |
| 668 | 672 |
} |
| 669 | 673 |
this.backstageTabItemOpenProject.Visibility = ElementVisibility.Collapsed; |
| 670 | 674 |
this.backstageButtonItemUserRegistration.Visibility = ElementVisibility.Collapsed; |
| 675 |
|
|
| 676 |
this.ribbonTabProjMgt.Visibility = ElementVisibility.Collapsed; |
|
| 671 | 677 |
} |
| 672 | 678 |
} |
| 673 | 679 |
|
| ... | ... | |
| 1276 | 1282 |
{
|
| 1277 | 1283 |
if (sender is RadDropDownList ddl) |
| 1278 | 1284 |
{
|
| 1279 |
if (string.IsNullOrEmpty(ddl.SelectedValue.ToString()))
|
|
| 1285 |
if (ddl.SelectedValue != null)
|
|
| 1280 | 1286 |
{
|
| 1281 |
ddl.BackColor = Color.White; |
|
| 1282 |
ddl.ForeColor = Color.Black; |
|
| 1283 |
ddl.Font = new Font("Segoe UI", 8.25F, FontStyle.Regular);
|
|
| 1284 |
} |
|
| 1285 |
else |
|
| 1286 |
{
|
|
| 1287 |
ddl.BackColor = Color.DarkSlateBlue; |
|
| 1288 |
ddl.ForeColor = Color.Yellow; |
|
| 1289 |
ddl.Font = new Font("Segoe UI", 8.25F, FontStyle.Bold);
|
|
| 1287 |
if (string.IsNullOrEmpty(ddl.SelectedValue.ToString())) |
|
| 1288 |
{
|
|
| 1289 |
ddl.BackColor = Color.White; |
|
| 1290 |
ddl.ForeColor = Color.Black; |
|
| 1291 |
ddl.Font = new Font("Segoe UI", 8.25F, FontStyle.Regular);
|
|
| 1292 |
} |
|
| 1293 |
else |
|
| 1294 |
{
|
|
| 1295 |
ddl.BackColor = Color.DarkSlateBlue; |
|
| 1296 |
ddl.ForeColor = Color.Yellow; |
|
| 1297 |
ddl.Font = new Font("Segoe UI", 8.25F, FontStyle.Bold);
|
|
| 1298 |
} |
|
| 1290 | 1299 |
} |
| 1291 | 1300 |
} |
| 1292 | 1301 |
} |
| 1293 | 1302 |
|
| 1294 | 1303 |
private void RadCheckBox_CheckStateChanged(object sender, EventArgs e) |
| 1295 | 1304 |
{
|
| 1296 |
if (sender is RadCheckBox) |
|
| 1305 |
if (sender is RadCheckBox checkBox)
|
|
| 1297 | 1306 |
{
|
| 1298 |
RadCheckBox checkBox = sender as RadCheckBox; |
|
| 1299 |
|
|
| 1300 | 1307 |
if (checkBox.Tag != null) |
| 1301 | 1308 |
{
|
| 1302 | 1309 |
ColumnGroupsViewDefinition columnGroupsView = this.radGridViewDocuments.MasterTemplate.ViewDefinition as ColumnGroupsViewDefinition; |
| ... | ... | |
| 1958 | 1965 |
{
|
| 1959 | 1966 |
if (RadMessageBox.Show("Do you want to Save?", Globals.Name, MessageBoxButtons.YesNo, RadMessageIcon.Question) == DialogResult.Yes)
|
| 1960 | 1967 |
{
|
| 1961 |
#region document no 중복 유효성 체크 |
|
| 1962 |
int dupDwgNoCount = 0; |
|
| 1963 |
List<string> newDwgNos = this.documents.Where(x => string.IsNullOrEmpty(x.DocID)).Select(x => x.DocumentNo).ToList(); |
|
| 1964 |
if (newDwgNos.Count > 0) |
|
| 1968 |
#region 유효성검사 |
|
| 1969 |
|
|
| 1970 |
#region 필수값 체크(Team, DWG_ID) |
|
| 1971 |
|
|
| 1972 |
if (this.documents.Any(x => string.IsNullOrEmpty(x.RefProjectCode))) |
|
| 1965 | 1973 |
{
|
| 1966 |
dupDwgNoCount = new DocumentController().ExistsDocument(informations.ActiveProject.ProjectID, newDwgNos); |
|
| 1974 |
RadMessageBox.Show($"Please, Check the required value (Team).", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info); |
|
| 1975 |
return; |
|
| 1967 | 1976 |
} |
| 1968 | 1977 |
|
| 1969 |
if (dupDwgNoCount > 0)
|
|
| 1978 |
if (this.documents.Any(x => string.IsNullOrEmpty(x.DocumentNo)))
|
|
| 1970 | 1979 |
{
|
| 1971 |
RadMessageBox.Show($"Duplicate Dwg No exists.({dupDwgNoCount})", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
| 1980 |
RadMessageBox.Show($"Please, Check the required value (DWG_ID).", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
| 1972 | 1981 |
return; |
| 1973 | 1982 |
} |
| 1983 |
|
|
| 1984 |
#endregion |
|
| 1985 |
|
|
| 1986 |
#endregion |
|
| 1987 |
|
|
| 1988 |
#region document no 중복 유효성 체크 |
|
| 1989 |
//int dupDwgNoCount = 0; |
|
| 1990 |
//List<string> newDwgNos = this.documents.Where(x => string.IsNullOrEmpty(x.DocID)).Select(x => x.DocumentNo).ToList(); |
|
| 1991 |
//if (newDwgNos.Count > 0) |
|
| 1992 |
//{
|
|
| 1993 |
// dupDwgNoCount = new DocumentController().ExistsDocument(informations.ActiveProject.ProjectID, newDwgNos); |
|
| 1994 |
//} |
|
| 1995 |
|
|
| 1996 |
//if (dupDwgNoCount > 0) |
|
| 1997 |
//{
|
|
| 1998 |
// RadMessageBox.Show($"Duplicate Dwg No exists.({dupDwgNoCount})", Globals.Name, MessageBoxButtons.OK, RadMessageIcon.Info);
|
|
| 1999 |
// return; |
|
| 2000 |
//} |
|
| 1974 | 2001 |
#endregion |
| 1975 | 2002 |
|
| 1976 | 2003 |
var worker = new SetDocumentsWorker(this.documents, this.orgDocuments, this.radGridViewDocuments); |
내보내기 Unified diff
