...

SubProject/FBS0000/Holiday/fHolyday.cs

@@ -61,17 +61,7 @@ namespace FBS0000
 			//if (string.IsNullOrEmpty(GrpName) == false) cmbGrp.Text = GrpName;
 			//else if (cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0;
 
-			//해당그룹내의 사용자 목록을 가져와야한다
-			var dtUser = FCOMMON.DBM.getUserTable();
-			//this.cmbUser.DisplayMember = "dispName";
-			//this.cmbUser.ValueMember = "id";
-			// this.bs.DataSource = dr;
-			this.cmbUser.Items.Clear();
-			this.cmbUser.Items.Add("-- ALL --");
-			foreach (DataRow dr in dtUser.Rows)
-			{
-				this.cmbUser.Items.Add(dr["dispname"].ToString());
-			}
+			UpdateUserList();
 
 			//일반사용자의경우에는 상태를 변경하지 못한다.
 			//int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday));
@@ -100,7 +90,6 @@ namespace FBS0000
 				//this.cmbUser.Enabled = false;   //사용자를 고칠수 없게 한다.
 
 			}
-			this.cmbUser.Text = string.Format("{1}({0})", FCOMMON.info.Login.no, FCOMMON.info.Login.nameK);
 			RefreshData();
 		}
 
@@ -722,5 +711,39 @@ namespace FBS0000
 			dtSD.Text = sd.ToShortDateString();
 			dtED.Text = ed.ToShortDateString();
 		}
+
+        private void toolStripLabel3_Click(object sender, EventArgs e)
+        {
+			//담당자 목록을 기간내로 업데이트합니다.
+			UpdateUserList(true);
+        }
+
+		void UpdateUserList(bool datelist = false)
+		{   //this.cmbUser.DisplayMember = "dispName";
+			//this.cmbUser.ValueMember = "id";
+			// this.bs.DataSource = dr;
+			this.cmbUser.Items.Clear();
+			this.cmbUser.Items.Add("-- ALL --");
+			//해당그룹내의 사용자 목록을 가져와야한다
+			if (datelist==false)
+            {
+				var dtUser = FCOMMON.DBM.getUserTable();
+				foreach (DataRow dr in dtUser.Rows)
+				{
+					this.cmbUser.Items.Add(dr["dispname"].ToString());
+				}
+            }
+            else
+            {
+				var ta = new dsMSSQLTableAdapters.HolydayUserListTableAdapter();
+				var dtUser = ta.GetData(FCOMMON.info.Login.gcode, dtSD.Text, dtED.Text);
+				foreach (dsMSSQL.HolydayUserListRow dr in dtUser.Rows)
+				{
+					this.cmbUser.Items.Add($"{dr.UserName}({dr.uid})");
+				}
+			}
+			this.cmbUser.Text = $"{FCOMMON.info.Login.nameK}({FCOMMON.info.Login.no})";
+			//if (this.cmbUser.SelectedIndex < 0) this.cmbUser.SelectedIndex = 0;
+		}
 	}
 }