Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

문자편집기 창 별도 추가했음,

Browse Source 
휴가내역 정렬 수정
This commit is contained in:
chi
2020-06-05 13:10:14 +09:00
parent a844e35d0b
commit bd442b73a8
20 changed files with 2697 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
SubProject/FPJ0000/Project/fProjectList.cs
View File

@@ -31,6 +31,7 @@ namespace FPJ0000
{
//프로젝트 목록을 처리함
//this.tbRequest.Text = FCOMMON.info.Login.nameK;
cmbDateType.SelectedIndex = 0; //기본시작일 기준으로 한다
//분류 - 190905
var dt_cate = FCOMMON.DBM.getCodeTable("20");
@@ -126,6 +127,11 @@ namespace FPJ0000
if (state.EndsWith("(") == false) state += ",";
state += "'완료'";
}
if(chk완료보고.Checked)
{
if (state.EndsWith("(") == false) state += ",";
state += "'완료(보고)'";
}
state += ")";
}
@@ -143,21 +149,28 @@ namespace FPJ0000
string State_Select = " SELECT *, dbo.getLastHistory(idx) AS lasthistory FROM Projects";
string State_where = " WHERE gcode=@gcode and ";
if (btViewDel.Checked==false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우
State_where += " pdate between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text +"-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우
var dateField = "pdate";
if (cmbDateType.SelectedIndex == 1) dateField = "edate";
else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
"ISNULL(usermain, '') LIKE @username OR " +
"ISNULL(reqstaff, '') LIKE @username OR " +
"ISNULL(usersub, '') LIKE @username) ";
if (state != "") State_where += " AND " + state;
if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'";
if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(userprocess,'') = '" + cmbProcess.Text.Trim() + "'";
string State_order = " ORDER BY (CASE " +
" WHEN ([status] = '진행') THEN '0' " +
" WHEN ([status] = '진행') THEN '0' " +
" WHEN ([status] = '검토') THEN '1' " +
" WHEN ([status] = '대기') THEN '2' " +
" WHEN ([status] = '대기') THEN '2' " +
" WHEN ([status] = '완료') THEN '3' " +
" WHEN ([status] = '보류') THEN '4' " +
" WHEN ([status] = '취소') THEN '9' " +
" WHEN ([status] = '완료(보고)') THEN '4' " +
" WHEN ([status] = '보류') THEN '5' " +
" WHEN ([status] = '취소') THEN '9' " +
" ELSE '5' END),userManager,sdate";
string request = "%";
@@ -166,7 +179,7 @@ namespace FPJ0000
System.Data.SqlClient.SqlCommand selCmd = new System.Data.SqlClient.SqlCommand();
selCmd.Connection = ta.Connection;
selCmd.CommandText = State_Select + State_where + State_order;
selCmd.Parameters.Add("gcode", SqlDbType.VarChar).Value= FCOMMON.info.Login.gcode;
selCmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode;
selCmd.Parameters.Add("username", SqlDbType.VarChar);
selCmd.Parameters["username"].Value = request;
@@ -216,9 +229,12 @@ namespace FPJ0000
case "보류":
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Tomato;
break;
case "완료":
case "완료(보고)":
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray;
break;
case "완료":
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Magenta;
break;
default:
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black;
break;
@@ -234,7 +250,7 @@ namespace FPJ0000
this.Validate();
this.bs.EndEdit();
if(pmt)
if (pmt)
{
var dlg = FCOMMON.Util.MsgQ("변경 사항을 저장하시겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
@@ -314,7 +330,7 @@ namespace FPJ0000
private void btSearch_Click(object sender, EventArgs e)
{
refreshData();
}
private void toolStripLabel3_Click(object sender, EventArgs e)
@@ -325,7 +341,7 @@ namespace FPJ0000
tbRequest.Text = string.Empty;
}
else tbRequest.Text = FCOMMON.info.Login.nameK;
refreshData();
}
@@ -407,7 +423,7 @@ namespace FPJ0000
{
try
{
var cols = new string[] {
var cols = new string[] {
"name","process","reqstaff","usermain",
"orderno","usersub","userManager",
"remark_req"};
@@ -482,14 +498,14 @@ namespace FPJ0000
return;
}
var dr = drv.Row as dsPRJ.ProjectsRow;
this.label1.Text = string.Format("[{0}] {1}",dr.name,dr.memo);
this.label1.Text = string.Format("[{0}] {1}", dr.name, dr.memo);
try
{
taHist.Fill(this.dsMSSQL.ProjectsHistory, dr.idx);
}
catch
catch
{
}
@@ -535,7 +551,7 @@ namespace FPJ0000
{
FCOMMON.Util.MsgE("Save Error\n" + ex.Message);
}
}
else newdr.Delete();
}
@@ -582,7 +598,7 @@ namespace FPJ0000
//Champion
//Requestor
//Process
switch(cmbSort.SelectedIndex)
switch (cmbSort.SelectedIndex)
{
case 1:
if (this.bs.Sort == "costo") this.bs.Sort = "costo desc";
@@ -629,7 +645,7 @@ namespace FPJ0000
private void toolStripButton2_Click(object sender, EventArgs e)
{
this.Close();
}
private void toolStripButton1_Click(object sender, EventArgs e)
@@ -701,5 +717,15 @@ namespace FPJ0000
{
showfolder();
}
private void button1_Click_1(object sender, EventArgs e)
{
this.Close();
}
private void button2_Click(object sender, EventArgs e)
{
refreshData();
}
}
}