..전자실 추가 중

This commit is contained in:
chi
2021-01-23 00:53:21 +09:00
parent d3778387de
commit 44110ef5c2
22 changed files with 3160 additions and 1082 deletions

View File

@@ -106,16 +106,17 @@ namespace FPJ0000.JobReport
//사용여부
chkEnable.Checked = dr.enable;
//담당자목록
var dt_users = FCOMMON.DBM.getUserTable();// getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
this.cmbUser.DisplayMember = "dispName";
this.cmbUser.ValueMember = "id";
this.cmbUser.DataSource = dt_users;
// tbWW.Text = dr.ww;
dtPdate.Value = DateTime.Parse(dr.pdate); //일자선택
dts.Value = DateTime.Parse(dr.pdate); //일자선택
dte.Value = DateTime.Parse(dr.edate);
cmbUser.SelectedValue = dr.uid;
tbProject.Text = dr.projectName;
cmbRequest.SelectedValue = dr.requestpart;
@@ -139,7 +140,7 @@ namespace FPJ0000.JobReport
tbProjectIndex.Text = dr.pidx.ToString();
}
if (string.IsNullOrEmpty(dr.description2))
{
this.richTextBoxEx1.Text = dr.description;
@@ -161,7 +162,7 @@ namespace FPJ0000.JobReport
if (this.richTextBoxEx1.Text.Trim() != "")
{
this.richTextBoxEx1.Focus();
this.richTextBoxEx1.Focus();
}
else
{
@@ -169,7 +170,7 @@ namespace FPJ0000.JobReport
tbProject.SelectAll();
}
tbProject.Tag = tbProject.Text;
// if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description;
//editor
@@ -180,12 +181,12 @@ namespace FPJ0000.JobReport
//ed.DisplayEditForm(this.panel1);
//ed.AllowRtf = true;
bInit = true;
}
// editform.editor ed;
// editform.editor ed;
void ctl_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
@@ -274,9 +275,9 @@ namespace FPJ0000.JobReport
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dtPdate.Value.ToShortDateString());
FCM0000.fSelectDate f = new FCM0000.fSelectDate(this.dts.Value.ToShortDateString());
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtPdate.Value = f.dtSelect;
dts.Value = f.dtSelect;
}
private void button1_Click(object sender, EventArgs e)
@@ -288,7 +289,7 @@ namespace FPJ0000.JobReport
tbProject.Focus();
return;
}
if (cmbType.Text != "휴가" && string.IsNullOrEmpty( this.richTextBoxEx1.Text )==true)
if (cmbType.Text != "휴가" && string.IsNullOrEmpty(this.richTextBoxEx1.Text) == true)
{
FCOMMON.Util.MsgE("진행 내용이 없습니다.");
this.richTextBoxEx1.Focus();
@@ -331,10 +332,10 @@ namespace FPJ0000.JobReport
tbProjectIndex.Text = "-1";
}
double hrs2 = 0.0;
if(double.TryParse(tbHrs.Text,out hrs2) ==false)
if (double.TryParse(tbHrs.Text, out hrs2) == false)
{
FCOMMON.Util.MsgE("근무시간을 숫자로 입력하세요");
tbHrs.Focus();
@@ -355,7 +356,7 @@ namespace FPJ0000.JobReport
dr.enable = chkEnable.Checked;
this.dr.uid = this.cmbUser.SelectedValue.ToString();
this.dr.pdate = dtPdate.Value.ToShortDateString();
this.dr.pdate = dts.Value.ToShortDateString();
this.dr.status = cmbState.Text;
this.dr.projectName = tbProject.Text;
if (tbProjectIndex.Text != "") dr.pidx = int.Parse(tbProjectIndex.Text);
@@ -404,19 +405,39 @@ namespace FPJ0000.JobReport
var myCal = myCI.Calendar;
var myCWR = myCI.DateTimeFormat.CalendarWeekRule;
DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek;
var dat = myCal.GetWeekOfYear(dtPdate.Value, myCWR, myFirstDOW);
var dat = myCal.GetWeekOfYear(dts.Value, myCWR, myFirstDOW);
tbWW.Text = "ww" + dat.ToString();
//공휴일이면 시간을 초기화한다.
if (tbHrs.Text == "") tbHrs.Text = "0";
if (tbOt.Text == "") tbOt.Text = "0";
float hrs = float.Parse(tbHrs.Text);
}
private void cmbUser_SelectedIndexChanged(object sender, EventArgs e)
{
}
private void tbOt_TextChanged(object sender, EventArgs e)
{
}
private void panel1_Paint(object sender, PaintEventArgs e)
{
}
private void dte_ValueChanged(object sender, EventArgs e)
{
var myCI = new System.Globalization.CultureInfo("ko-KR");
var myCal = myCI.Calendar;
var myCWR = myCI.DateTimeFormat.CalendarWeekRule;
DayOfWeek myFirstDOW = myCI.DateTimeFormat.FirstDayOfWeek;
var dat = myCal.GetWeekOfYear(dte.Value, myCWR, myFirstDOW);
this.tbWeekE.Text = "ww" + dat.ToString();
}
}
}