개정판 40a1e23a
issue #0000
ID2, AVEVA
- document의 담당자, 작업자 정보를 초기화 할 수 있도록 수정
Change-Id: I7d222f1b55189d58381e6df62f32130e91721e37
| ID2.Manager/ID2.Manager.Data/Models/Documents.cs | ||
|---|---|---|
| 44 | 44 |
set => SetProperty(ref this._JobLevel, value); |
| 45 | 45 |
} |
| 46 | 46 | |
| 47 |
private string _PersonInCharge = string.Empty;
|
|
| 47 |
private string _PersonInCharge = null;
|
|
| 48 | 48 |
//[DataMember] |
| 49 | 49 |
public string PersonInCharge |
| 50 | 50 |
{
|
| ... | ... | |
| 52 | 52 |
set => SetProperty(ref this._PersonInCharge, value); |
| 53 | 53 |
} |
| 54 | 54 | |
| 55 |
private string _Worker = string.Empty;
|
|
| 55 |
private string _Worker = null;
|
|
| 56 | 56 |
//[DataMember] |
| 57 | 57 |
public string Worker |
| 58 | 58 |
{
|
| ... | ... | |
| 145 | 145 |
set => SetProperty(ref this._IsConvert, value); |
| 146 | 146 |
} |
| 147 | 147 | |
| 148 |
private string _AVEVAPersonInCharge = string.Empty;
|
|
| 148 |
private string _AVEVAPersonInCharge = null;
|
|
| 149 | 149 |
//[DataMember] |
| 150 | 150 |
public string AVEVAPersonInCharge |
| 151 | 151 |
{
|
| ... | ... | |
| 153 | 153 |
set => SetProperty(ref this._AVEVAPersonInCharge, value); |
| 154 | 154 |
} |
| 155 | 155 | |
| 156 |
private string _AVEVAWorker = string.Empty;
|
|
| 156 |
private string _AVEVAWorker = null;
|
|
| 157 | 157 |
//[DataMember] |
| 158 | 158 |
public string AVEVAWorker |
| 159 | 159 |
{
|
| ID2.Manager/ID2.Manager/Main.cs | ||
|---|---|---|
| 1250 | 1250 | |
| 1251 | 1251 |
var workUsers = informations.UserList.Where(x => (new string[] { "Manager", "User" }).Contains(x.Role) && string.IsNullOrEmpty(x.RefProjectID));
|
| 1252 | 1252 |
var clientUsers = informations.UserList.Where(x => !string.IsNullOrEmpty(x.RefProjectID)); |
| 1253 |
var emptyUser = new UserInfo() { ID = null, Name = null };
|
|
| 1253 | 1254 | |
| 1254 | 1255 |
GridViewComboBoxColumn ColPersonInCharge = this.radGridViewDocuments.Columns["PersonInCharge"] as GridViewComboBoxColumn; |
| 1255 |
ColPersonInCharge.DataSource = workUsers; |
|
| 1256 |
ColPersonInCharge.DataSource = workUsers.Prepend(emptyUser);
|
|
| 1256 | 1257 |
ColPersonInCharge.DisplayMember = "Name"; |
| 1257 | 1258 |
ColPersonInCharge.ValueMember = "ID"; |
| 1258 | 1259 | |
| 1259 | 1260 |
GridViewComboBoxColumn ColWorker = this.radGridViewDocuments.Columns["Worker"] as GridViewComboBoxColumn; |
| 1260 |
ColWorker.DataSource = workUsers; |
|
| 1261 |
ColWorker.DataSource = workUsers.Prepend(emptyUser);
|
|
| 1261 | 1262 |
ColWorker.DisplayMember = "Name"; |
| 1262 | 1263 |
ColWorker.ValueMember = "ID"; |
| 1263 | 1264 | |
| 1264 | 1265 |
GridViewComboBoxColumn ColAVEVAPersonInCharge = this.radGridViewDocuments.Columns["AVEVAPersonInCharge"] as GridViewComboBoxColumn; |
| 1265 |
ColAVEVAPersonInCharge.DataSource = workUsers; |
|
| 1266 |
ColAVEVAPersonInCharge.DataSource = workUsers.Prepend(emptyUser);
|
|
| 1266 | 1267 |
ColAVEVAPersonInCharge.DisplayMember = "Name"; |
| 1267 | 1268 |
ColAVEVAPersonInCharge.ValueMember = "ID"; |
| 1268 | 1269 | |
| 1269 | 1270 |
GridViewComboBoxColumn ColAVEVAWorker = this.radGridViewDocuments.Columns["AVEVAWorker"] as GridViewComboBoxColumn; |
| 1270 |
ColAVEVAWorker.DataSource = workUsers; |
|
| 1271 |
ColAVEVAWorker.DataSource = workUsers.Prepend(emptyUser);
|
|
| 1271 | 1272 |
ColAVEVAWorker.DisplayMember = "Name"; |
| 1272 | 1273 |
ColAVEVAWorker.ValueMember = "ID"; |
| 1273 | 1274 | |
| ... | ... | |
| 1952 | 1953 |
bool isMaxValue = position == vScroll.Maximum - vScroll.LargeChange + 1; |
| 1953 | 1954 |
radGridViewDocuments.TableElement.UpdateView(); |
| 1954 | 1955 | |
| 1955 |
string colValue = e.Row.Cells[e.Column.Name].Value == null ? string.Empty : (string)e.Row.Cells[e.Column.Name].Value;
|
|
| 1956 |
object colValue = e.Row.Cells[e.Column.Name].Value;
|
|
| 1956 | 1957 | |
| 1957 | 1958 |
radGridViewDocuments.BeginUpdate(); |
| 1958 | 1959 |
radGridViewDocuments.MasterTemplate.BeginUpdate(); |
내보내기 Unified diff