프로젝트

일반

사용자정보

개정판 2cd9327e

ID2cd9327ef281ac774ef6a3a89360f6eda6b1648d
상위 1768fb05
하위 3a78baea

유성호이(가) 일년 이상 전에 추가함

issue #0000
project 정보에 Port 항목 추가(id2연결관리)
- 기본값 2549
- 범위 0~65535

Change-Id: Ifd6935f52472966cf6f8a7b4580b6053c8ae07be

차이점 보기:

ID2.Manager/ID2.Manager.Controller/Controllers/ProjectController.cs
33 33 
                               GroupID = mg.GroupID,
34 34 
                               GroupName = mg.GroupName,
35 35 
                               Team = mg.Team,
36 
                               Port = mg.Port,
36 37 
                               Level = mg.Level,
37 38 
                               ID2Info = prjs ?? new ID2ProjectInfo(),
38 39 
                           };
ID2.Manager/ID2.Manager.Dapper/Repository/ProjectRepository.cs
26 26 
	      ,isnull(ParentID,'') GroupID
27 27 
          ,convert(varchar(255),'') GroupName
28 28 
          ,isnull(Team,'') Team
29 
          ,Port
29 30 
		  ,1 [Level]
30 31 
	from   dbo.Projects
31 32 
	where  ParentID is null
......
39 40 
          ,p.ParentID GroupID
40 41 
		  ,pp.[Name] GroupName
41 42 
          ,p.Team
43 
          ,p.Port
42 44 
          ,pp.[Level]+1 [Level]
43 45 
    FROM   dbo.Projects p
44 46 
               inner join Prj pp ON p.ParentID=pp.ProjectID
......
69 71 
	      ,isnull(ParentID,'') GroupID
70 72 
          ,convert(varchar(255),'') GroupName
71 73 
          ,isnull(Team,'') Team
74 
          ,Port
72 75 
		  ,1 [Level]
73 76 
	from   dbo.Projects
74 77 
	where  ParentID is null
......
82 85 
          ,p.ParentID GroupID
83 86 
		  ,pp.[Name] GroupName
84 87 
          ,p.Team
88 
          ,p.Port
85 89 
          ,pp.[Level]+1 [Level]
86 90 
    FROM   dbo.Projects p
87 91 
               inner join Prj pp ON p.ParentID=pp.ProjectID
......
162 166 
                                { "ParentID", projectInfo.ProjectID },
163 167 
                                { "Name", prj.Name },
164 168 
                                { "Desc", prj.Desc },
165 
                                { "Team", prj.Team }
169 
                                { "Team", prj.Team },
170 
                                { "Port", prj.Port },
166 171 
                            };
167 172 

  		




  168
  173
  
    
                            query = $@"


  		




  ......




  171
  176
  
    
    update dbo.Projects


  		




  172
  177
  
    
    set    [Description]=@Desc


  		




  173
  178
  
    
          ,Team=@Team


  		




  
  179
  
    
          ,Port=@Port


  		




  174
  180
  
    
    where  ParentID=@ParentID and Code=@Name


  		




  175
  181
  
    
end


  		




  176
  182
  
    
else


  		




  ......




  183
  189
  
    
        ,[Name]


  		




  184
  190
  
    
        ,[Description]


  		




  185
  191
  
    
        ,Team


  		




  
  192
  
    
        ,Port


  		




  186
  193
  
    
    )


  		




  187
  194
  
    
    values 


  		




  188
  195
  
    
    (


  		




  ......




  192
  199
  
    
        ,@Name


  		




  193
  200
  
    
        ,@Desc


  		




  194
  201
  
    
        ,@Team


  		




  
  202
  
    
        ,@Port


  		




  195
  203
  
    
    )


  		




  196
  204
  
    
end;";


  		




  197
  205
  
    
                            base.Execute(query, parameters, transaction);


  		












  

    
      ID2.Manager/ID2.Manager.Data/Models/ProjectInfo.cs
    
  





  28
  28
  
    
        [DataMember]


  		




  29
  29
  
    
        public string Team { get; set; }


  		




  30
  30
  
    
        [DataMember]


  		




  
  31
  
    
        public int? Port { get; set; } = 2549;


  		




  
  32
  
    
        [DataMember]


  		




  31
  33
  
    
        public int Level { get; set; }


  		




  32
  34
  
    
        [DataMember]


  		




  33
  35
  
    
        public ID2ProjectInfo ID2Info = null;


  		




  ......




  65
  67
  
    
        public string DBPath { get; set; }


  		




  66
  68
  
    
        [DataMember]


  		




  67
  69
  
    
        public string Team { get; set; }


  		




  
  70
  
    
        [DataMember]


  		




  
  71
  
    
        public int? Port { get; set; } = 2549;


  		




  68
  72
  
    
    }


  		




  69
  73
  
    
}


  		












  

    
      ID2.Manager/ID2.Manager/Controls/OpenProjectView.Designer.cs
    
  





  31
  31
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn1 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  32
  32
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn2 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  33
  33
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn3 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  
  34
  
    
            Telerik.WinControls.UI.GridViewDecimalColumn gridViewDecimalColumn1 = new Telerik.WinControls.UI.GridViewDecimalColumn();


  		




  34
  35
  
    
            Telerik.WinControls.UI.TableViewDefinition tableViewDefinition1 = new Telerik.WinControls.UI.TableViewDefinition();


  		




  35
  36
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn4 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  36
  37
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn5 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  ......




  76
  77
  
    
            this.tableLayoutPanelProject.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));


  		




  77
  78
  
    
            this.tableLayoutPanelProject.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));


  		




  78
  79
  
    
            this.tableLayoutPanelProject.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));


  		




  79
  
  
    
            this.tableLayoutPanelProject.Size = new System.Drawing.Size(970, 550);


  		




  
  80
  
    
            this.tableLayoutPanelProject.Size = new System.Drawing.Size(1050, 550);


  		




  80
  81
  
    
            this.tableLayoutPanelProject.TabIndex = 0;


  		




  81
  82
  
    
            // 


  		




  82
  83
  
    
            // tableLayoutPanel1


  		




  ......




  93
  94
  
    
            this.tableLayoutPanel1.Name = "tableLayoutPanel1";


  		




  94
  95
  
    
            this.tableLayoutPanel1.RowCount = 1;


  		




  95
  96
  
    
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));


  		




  96
  
  
    
            this.tableLayoutPanel1.Size = new System.Drawing.Size(924, 29);


  		




  
  97
  
    
            this.tableLayoutPanel1.Size = new System.Drawing.Size(1004, 29);


  		




  97
  98
  
    
            this.tableLayoutPanel1.TabIndex = 9;


  		




  98
  99
  
    
            // 


  		




  99
  100
  
    
            // radButtonDelete


  		




  ......




  137
  138
  
    
            gridViewTextBoxColumn3.Name = "Team";


  		




  138
  139
  
    
            gridViewTextBoxColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;


  		




  139
  140
  
    
            gridViewTextBoxColumn3.Width = 100;


  		




  
  141
  
    
            gridViewDecimalColumn1.DataType = typeof(int);


  		




  
  142
  
    
            gridViewDecimalColumn1.FieldName = "Port";


  		




  
  143
  
    
            gridViewDecimalColumn1.HeaderText = "Port";


  		




  
  144
  
    
            gridViewDecimalColumn1.Maximum = new decimal(new int[] {


  		




  
  145
  
    
            65535,


  		




  
  146
  
    
            0,


  		




  
  147
  
    
            0,


  		




  
  148
  
    
            0});


  		




  
  149
  
    
            gridViewDecimalColumn1.Minimum = new decimal(new int[] {


  		




  
  150
  
    
            0,


  		




  
  151
  
    
            0,


  		




  
  152
  
    
            0,


  		




  
  153
  
    
            0});


  		




  
  154
  
    
            gridViewDecimalColumn1.Name = "Port";


  		




  
  155
  
    
            gridViewDecimalColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;


  		




  
  156
  
    
            gridViewDecimalColumn1.Width = 80;


  		




  140
  157
  
    
            this.radGridViewProjects.MasterTemplate.Columns.AddRange(new Telerik.WinControls.UI.GridViewDataColumn[] {


  		




  141
  158
  
    
            gridViewTextBoxColumn1,


  		




  142
  159
  
    
            gridViewTextBoxColumn2,


  		




  143
  
  
    
            gridViewTextBoxColumn3});


  		




  
  160
  
    
            gridViewTextBoxColumn3,


  		




  
  161
  
    
            gridViewDecimalColumn1});


  		




  144
  162
  
    
            this.radGridViewProjects.MasterTemplate.EnableGrouping = false;


  		




  145
  163
  
    
            this.radGridViewProjects.MasterTemplate.SelectionMode = Telerik.WinControls.UI.GridViewSelectionMode.None;


  		




  146
  164
  
    
            this.radGridViewProjects.MasterTemplate.ViewDefinition = tableViewDefinition1;


  		




  147
  165
  
    
            this.radGridViewProjects.Name = "radGridViewProjects";


  		




  148
  166
  
    
            this.radGridViewProjects.ReadOnly = true;


  		




  149
  
  
    
            this.radGridViewProjects.Size = new System.Drawing.Size(554, 434);


  		




  
  167
  
    
            this.radGridViewProjects.Size = new System.Drawing.Size(634, 434);


  		




  150
  168
  
    
            this.radGridViewProjects.TabIndex = 7;


  		




  151
  169
  
    
            // 


  		




  152
  170
  
    
            // radGridViewGroup


  		




  ......




  193
  211
  
    
            this.tableLayoutPanelButton.RowCount = 1;


  		




  194
  212
  
    
            this.tableLayoutPanelButton.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));


  		




  195
  213
  
    
            this.tableLayoutPanelButton.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));


  		




  196
  
  
    
            this.tableLayoutPanelButton.Size = new System.Drawing.Size(924, 29);


  		




  
  214
  
    
            this.tableLayoutPanelButton.Size = new System.Drawing.Size(1004, 29);


  		




  197
  215
  
    
            this.tableLayoutPanelButton.TabIndex = 8;


  		




  198
  216
  
    
            // 


  		




  199
  217
  
    
            // radButtonOpen


  		




  200
  218
  
    
            // 


  		




  201
  
  
    
            this.radButtonOpen.Location = new System.Drawing.Point(767, 3);


  		




  
  219
  
    
            this.radButtonOpen.Location = new System.Drawing.Point(847, 3);


  		




  202
  220
  
    
            this.radButtonOpen.Name = "radButtonOpen";


  		




  203
  221
  
    
            this.radButtonOpen.Size = new System.Drawing.Size(74, 23);


  		




  204
  222
  
    
            this.radButtonOpen.TabIndex = 0;


  		




  ......




  206
  224
  
    
            // 


  		




  207
  225
  
    
            // radButtonClose


  		




  208
  226
  
    
            // 


  		




  209
  
  
    
            this.radButtonClose.Location = new System.Drawing.Point(847, 3);


  		




  
  227
  
    
            this.radButtonClose.Location = new System.Drawing.Point(927, 3);


  		




  210
  228
  
    
            this.radButtonClose.Name = "radButtonClose";


  		




  211
  229
  
    
            this.radButtonClose.Size = new System.Drawing.Size(74, 23);


  		




  212
  230
  
    
            this.radButtonClose.TabIndex = 1;


  		




  ......




  218
  236
  
    
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


  		




  219
  237
  
    
            this.Controls.Add(this.tableLayoutPanelProject);


  		




  220
  238
  
    
            this.Name = "OpenProjectView";


  		




  221
  
  
    
            this.Size = new System.Drawing.Size(970, 550);


  		




  
  239
  
    
            this.Size = new System.Drawing.Size(1050, 550);


  		




  222
  240
  
    
            this.tableLayoutPanelProject.ResumeLayout(false);


  		




  223
  241
  
    
            this.tableLayoutPanel1.ResumeLayout(false);


  		




  224
  242
  
    
            ((System.ComponentModel.ISupportInitialize)(this.radButtonDelete)).EndInit();


  		












  

    
      ID2.Manager/ID2.Manager/Forms/SetupProject.Designer.cs
    
  





  34
  34
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn2 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  35
  35
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn3 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  36
  36
  
    
            Telerik.WinControls.UI.GridViewTextBoxColumn gridViewTextBoxColumn4 = new Telerik.WinControls.UI.GridViewTextBoxColumn();


  		




  
  37
  
    
            Telerik.WinControls.UI.GridViewDecimalColumn gridViewDecimalColumn1 = new Telerik.WinControls.UI.GridViewDecimalColumn();


  		




  37
  38
  
    
            Telerik.WinControls.UI.TableViewDefinition tableViewDefinition1 = new Telerik.WinControls.UI.TableViewDefinition();


  		




  38
  39
  
    
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SetupProject));


  		




  39
  40
  
    
            this.tableLayoutPanelWrap = new System.Windows.Forms.TableLayoutPanel();


  		




  ......




  92
  93
  
    
            this.tableLayoutPanelWrap.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));


  		




  93
  94
  
    
            this.tableLayoutPanelWrap.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));


  		




  94
  95
  
    
            this.tableLayoutPanelWrap.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));


  		




  95
  
  
    
            this.tableLayoutPanelWrap.Size = new System.Drawing.Size(912, 500);


  		




  
  96
  
    
            this.tableLayoutPanelWrap.Size = new System.Drawing.Size(992, 500);


  		




  96
  97
  
    
            this.tableLayoutPanelWrap.TabIndex = 0;


  		




  97
  98
  
    
            // 


  		




  98
  99
  
    
            // tableLayoutPanel1


  		




  ......




  111
  112
  
    
            this.tableLayoutPanel1.Name = "tableLayoutPanel1";


  		




  112
  113
  
    
            this.tableLayoutPanel1.RowCount = 1;


  		




  113
  114
  
    
            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));


  		




  114
  
  
    
            this.tableLayoutPanel1.Size = new System.Drawing.Size(886, 29);


  		




  
  115
  
    
            this.tableLayoutPanel1.Size = new System.Drawing.Size(966, 29);


  		




  115
  116
  
    
            this.tableLayoutPanel1.TabIndex = 10;


  		




  116
  117
  
    
            // 


  		




  117
  118
  
    
            // radButtonColse


  		




  118
  119
  
    
            // 


  		




  119
  
  
    
            this.radButtonColse.Location = new System.Drawing.Point(809, 3);


  		




  
  120
  
    
            this.radButtonColse.Location = new System.Drawing.Point(889, 3);


  		




  120
  121
  
    
            this.radButtonColse.Name = "radButtonColse";


  		




  121
  122
  
    
            this.radButtonColse.Size = new System.Drawing.Size(74, 23);


  		




  122
  123
  
    
            this.radButtonColse.TabIndex = 1;


  		




  ......




  125
  126
  
    
            // radButtonSave


  		




  126
  127
  
    
            // 


  		




  127
  128
  
    
            this.radButtonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));


  		




  128
  
  
    
            this.radButtonSave.Location = new System.Drawing.Point(729, 3);


  		




  
  129
  
    
            this.radButtonSave.Location = new System.Drawing.Point(809, 3);


  		




  129
  130
  
    
            this.radButtonSave.Name = "radButtonSave";


  		




  130
  131
  
    
            this.radButtonSave.Size = new System.Drawing.Size(74, 23);


  		




  131
  132
  
    
            this.radButtonSave.TabIndex = 9;


  		




  ......




  183
  184
  
    
            this.radGroupBoxID2.Location = new System.Drawing.Point(283, 38);


  		




  184
  185
  
    
            this.radGroupBoxID2.Name = "radGroupBoxID2";


  		




  185
  186
  
    
            this.tableLayoutPanelWrap.SetRowSpan(this.radGroupBoxID2, 4);


  		




  186
  
  
    
            this.radGroupBoxID2.Size = new System.Drawing.Size(606, 439);


  		




  
  187
  
    
            this.radGroupBoxID2.Size = new System.Drawing.Size(686, 439);


  		




  187
  188
  
    
            this.radGroupBoxID2.TabIndex = 7;


  		




  188
  189
  
    
            this.radGroupBoxID2.Text = "ID2 List";


  		




  189
  190
  
    
            // 


  		




  ......




  220
  221
  
    
            gridViewTextBoxColumn4.Name = "Team";


  		




  221
  222
  
    
            gridViewTextBoxColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;


  		




  222
  223
  
    
            gridViewTextBoxColumn4.Width = 100;


  		




  
  224
  
    
            gridViewDecimalColumn1.DataType = typeof(int);


  		




  
  225
  
    
            gridViewDecimalColumn1.FieldName = "Port";


  		




  
  226
  
    
            gridViewDecimalColumn1.HeaderText = "Port";


  		




  
  227
  
    
            gridViewDecimalColumn1.Maximum = new decimal(new int[] {


  		




  
  228
  
    
            65535,


  		




  
  229
  
    
            0,


  		




  
  230
  
    
            0,


  		




  
  231
  
    
            0});


  		




  
  232
  
    
            gridViewDecimalColumn1.Minimum = new decimal(new int[] {


  		




  
  233
  
    
            0,


  		




  
  234
  
    
            0,


  		




  
  235
  
    
            0,


  		




  
  236
  
    
            0});


  		




  
  237
  
    
            gridViewDecimalColumn1.Name = "Port";


  		




  
  238
  
    
            gridViewDecimalColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;


  		




  
  239
  
    
            gridViewDecimalColumn1.Width = 80;


  		




  223
  240
  
    
            this.radGridViewID2Project.MasterTemplate.Columns.AddRange(new Telerik.WinControls.UI.GridViewDataColumn[] {


  		




  224
  241
  
    
            gridViewCheckBoxColumn1,


  		




  225
  242
  
    
            gridViewTextBoxColumn1,


  		




  226
  243
  
    
            gridViewTextBoxColumn2,


  		




  227
  244
  
    
            gridViewTextBoxColumn3,


  		




  228
  
  
    
            gridViewTextBoxColumn4});


  		




  
  245
  
    
            gridViewTextBoxColumn4,


  		




  
  246
  
    
            gridViewDecimalColumn1});


  		




  229
  247
  
    
            this.radGridViewID2Project.MasterTemplate.ViewDefinition = tableViewDefinition1;


  		




  230
  248
  
    
            this.radGridViewID2Project.Name = "radGridViewID2Project";


  		




  231
  
  
    
            this.radGridViewID2Project.Size = new System.Drawing.Size(602, 419);


  		




  
  249
  
    
            this.radGridViewID2Project.Size = new System.Drawing.Size(682, 419);


  		




  232
  250
  
    
            this.radGridViewID2Project.TabIndex = 4;


  		




  233
  251
  
    
            // 


  		




  234
  252
  
    
            // radTextBoxDescription


  		




  ......




  249
  267
  
    
            // 


  		




  250
  268
  
    
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);


  		




  251
  269
  
    
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


  		




  252
  
  
    
            this.ClientSize = new System.Drawing.Size(912, 500);


  		




  
  270
  
    
            this.ClientSize = new System.Drawing.Size(992, 500);


  		




  253
  271
  
    
            this.Controls.Add(this.tableLayoutPanelWrap);


  		




  254
  272
  
    
            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));


  		




  255
  273
  
    
            this.Name = "SetupProject";


  		












  

    
      ID2.Manager/ID2.Manager/Forms/SetupProject.cs
    
  





  82
  82
  
    
                                   User = id2.User,


  		




  83
  83
  
    
                                   Password = id2.Password,


  		




  84
  84
  
    
                                   DBPath = id2.DBPath,


  		




  85
  
  
    
                                   Team = prjs?.Team ?? null


  		




  
  85
  
    
                                   Team = prjs?.Team ?? null,


  		




  
  86
  
    
                                   Port = prjs?.Port ?? id2.Port


  		




  86
  87
  
    
                               }).Select(x =>


  		




  87
  88
  
    
                               {


  		




  88
  89
  
    
                                   x.Checked = allProject.Where(y => y.GroupID.Equals(this.ProjectInfo?.ProjectID ?? string.Empty) && x.Name.Equals(y.Code)).Any();


  		




  
  90
  
    
                                   x.Port = allProject.Where(y => x.Name.Equals(y.Code)).Any() ? allProject.Where(y => x.Name.Equals(y.Code)).FirstOrDefault().Port : null;


  		




  89
  91
  
    
                                   return x;


  		




  90
  92
  
    
                               });


  		




  91
  93
  
    

  		




  ......




  108
  110
  
    

  		




  109
  111
  
    
                var id2ChkCol = e.RowElement.RowInfo.Cells["Checked"];


  		




  110
  112
  
    
                var id2TeamCol = e.RowElement.RowInfo.Cells["Team"];


  		




  
  113
  
    
                var id2PortCol = e.RowElement.RowInfo.Cells["Port"];


  		




  111
  114
  
    

  		




  112
  115
  
    
                string ID2Name = result.Name ?? string.Empty;


  		




  113
  116
  
    

  		




  ......




  140
  143
  
    
                if (isChecked)


  		




  141
  144
  
    
                {


  		




  142
  145
  
    
                    id2TeamCol.ReadOnly = false;


  		




  
  146
  
    
                    id2PortCol.ReadOnly = false;


  		




  143
  147
  
    
                }


  		




  144
  148
  
    
                else


  		




  145
  149
  
    
                {


  		




  146
  150
  
    
                    id2TeamCol.ReadOnly = true;


  		




  
  151
  
    
                    id2PortCol.ReadOnly = true;


  		




  147
  152
  
    
                }


  		




  148
  153
  
    

  		




  149
  154
  
    
                if (id2ChkCol.ReadOnly)


  		












내보내기  Unified diff




        
        

    















   



  

  
  클립보드 이미지 추가
  (최대 크기: 500 MB)