diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj index 7c6480a..15bf1e2 100644 --- a/SubProject/FCOMMON/FCOMMON.csproj +++ b/SubProject/FCOMMON/FCOMMON.csproj @@ -150,6 +150,7 @@ fWebCamera.cs + diff --git a/SubProject/FCOMMON/ISO8601.cs b/SubProject/FCOMMON/ISO8601.cs new file mode 100644 index 0000000..816d400 --- /dev/null +++ b/SubProject/FCOMMON/ISO8601.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; + + +namespace ISO8601 +{ + public static class Calender + { + private static CultureInfo culture = CultureInfo.CurrentCulture; + + private static int CalcDate(DateTime date) + { + return date.DayOfWeek != DayOfWeek.Sunday ? DayOfWeek.Thursday - date.DayOfWeek : (int)DayOfWeek.Tuesday - 7; + } + + public static int GetYear(DateTime date) + { + date = date.AddDays(CalcDate(date)); + return culture.Calendar.GetYear(date); + } + + public static int GetMonth(DateTime date) + { + date = date.AddDays(CalcDate(date)); + return culture.Calendar.GetMonth(date); + } + + public static int GetWorkWeek(DateTime date) + { + date = date.AddDays(CalcDate(date)); + return culture.Calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday); + } + } +} diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs index 7358a11..50ba8a9 100644 --- a/SubProject/FPJ0000/EBoard/fEboardList.cs +++ b/SubProject/FPJ0000/EBoard/fEboardList.cs @@ -203,6 +203,7 @@ namespace FPJ0000 { FCOMMON.Util.MsgE(ex.Message); } + FormattingData(); } private void projectsBindingNavigatorSaveItem_Click(object sender, EventArgs e) @@ -388,6 +389,17 @@ namespace FPJ0000 var fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "EBoardDailyform.xlsx"); System.IO.File.Copy(fn, sd.FileName, true); book.load(sd.FileName); + + //week 기록 + var lastrow = dsMSSQL.EETGW_JobReport_EBoard.FirstOrDefault(); + if(lastrow != null) + { + var ww = ISO8601.Calender.GetWorkWeek(DateTime.Parse( lastrow.pdate)); + var sht1 = book.getSheet(2); + sht1.writeNum(1, 0, ww); + } + + var sht = book.getSheet(0); //2번쨰 줄부터 데이터를 기록한다. var row = 1; diff --git a/SubProject/FPJ0000/EboardDailyform.xlsx b/SubProject/FPJ0000/EboardDailyform.xlsx index cd1f4d9..827e08a 100644 Binary files a/SubProject/FPJ0000/EboardDailyform.xlsx and b/SubProject/FPJ0000/EboardDailyform.xlsx differ