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

구매입력시 엔터키, 기본 일자 조회범위를 90일로 변경.

Browse Source
This commit is contained in:
chi
2024-03-15 17:13:01 +09:00
parent 24c4a426c0
commit a56c186845
25 changed files with 818 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
SubProject/FPJ0000/JobReport_/rJobReportPrj.cs
View File

@@ -145,6 +145,12 @@ namespace FPJ0000.JobReport_
row.Add("--");
row.Add("비 프로젝트 업무");
}
else if (dr.Key == "미팅")
{
row.Add("--");
row.Add("미팅");
addholy = true;
}
else if (dr.Key == "휴가")
{
row.Add("--");
@@ -186,7 +192,7 @@ namespace FPJ0000.JobReport_
row.Add(tperc);
if (string.IsNullOrEmpty(dr.Key))
if (string.IsNullOrEmpty(dr.Key) || dr.Key == "휴가" || dr.Key == "미팅")
dv1.Rows.Insert(0, row.ToArray());
else
dv1.Rows.Add(row.ToArray());
@@ -226,28 +232,45 @@ namespace FPJ0000.JobReport_
}
//첫줄은 색상을 변경해준다.
if (dv1.RowCount > 0)
{
var dvrow = dv1.Rows[0];
for (int i = 0; i < this.dv1.ColumnCount; i++)
{
var c = dvrow.Cells[i];
c.Style.BackColor = Color.LightGray;
}
//if (dv1.RowCount > 0)
//{
// var dvrow = dv1.Rows[0];
// for (int i = 0; i < this.dv1.ColumnCount; i++)
// {
// var c = dvrow.Cells[i];
// c.Style.BackColor = Color.LightGray;
// }
}
if (addholy && dv1.RowCount > 1)
//}
for(int r = 0; r < dv1.RowCount;r++)
{
var dvrow = dv1.Rows[1];
for (int i = 0; i < this.dv1.ColumnCount; i++)
var dvrow = dv1.Rows[r];
var idxvlaue = dvrow.Cells[0].Value.ToString();
if (idxvlaue == "-1")
{
var c = dvrow.Cells[i];
c.Style.BackColor = Color.LightGray;
for (int i = 0; i < this.dv1.ColumnCount; i++)
{
var c = dvrow.Cells[i];
c.Style.BackColor = Color.LightGray;
}
}
else break;
}
//if (addholy && dv1.RowCount > 1)
//{
// var dvrow = dv1.Rows[1];
// for (int i = 0; i < this.dv1.ColumnCount; i++)
// {
// var c = dvrow.Cells[i];
// c.Style.BackColor = Color.LightGray;
// }
//}
this.dv1.AutoResizeColumns();
}

8
SubProject/FPJ0000/Properties/Settings.Designer.cs generated
View File

@@ -12,7 +12,7 @@ namespace FPJ0000.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -27,7 +27,7 @@ namespace FPJ0000.Properties {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
"user;Password=Amkor123!")]
"user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
public string gwcs {
get {
return ((string)(this["gwcs"]));
@@ -38,7 +38,7 @@ namespace FPJ0000.Properties {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
"user;Password=Amkor123!")]
"user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
public string EEEntities {
get {
return ((string)(this["EEEntities"]));
@@ -49,7 +49,7 @@ namespace FPJ0000.Properties {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=ee" +
"user;Password=Amkor123!")]
"user;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True")]
public string EEEntitiesLayout {
get {
return ((string)(this["EEEntitiesLayout"]));

18
SubProject/FPJ0000/Properties/Settings.settings
View File

@@ -4,26 +4,26 @@
<Settings>
<Setting Name="gwcs" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
<Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
</Setting>
<Setting Name="EEEntities" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
<Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
</Setting>
<Setting Name="EEEntitiesLayout" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!&lt;/ConnectionString&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!</Value>
<Value Profile="(Default)">Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True</Value>
</Setting>
</Settings>
</SettingsFile>

17
SubProject/FPJ0000/app.config
View File

@@ -5,12 +5,17 @@
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<connectionStrings>
<add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.33;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
<add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient"/>
<add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient"/>
<add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
<add name="EEEntitiesLayout" connectionString="metadata=res://*/ModelLayout.csdl|res://*/ModelLayout.ssdl|res://*/ModelLayout.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
<add name="FPJ0000.Properties.Settings.EEEntitiesLayout" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"/>
<add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.33;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
providerName="System.Data.SqlClient" />
<add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
<add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
<add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
providerName="System.Data.EntityClient" />
<add name="EEEntitiesLayout" connectionString="metadata=res://*/ModelLayout.csdl|res://*/ModelLayout.ssdl|res://*/ModelLayout.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
providerName="System.Data.EntityClient" />
<add name="FPJ0000.Properties.Settings.EEEntitiesLayout" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!;Encrypt=False;TrustServerCertificate=True" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>

7
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -9040,12 +9040,13 @@ ORDER BY pdate";
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs,
Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName
Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END))
AS PrjName
FROM JobReport WITH (nolock) LEFT OUTER JOIN
Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0)
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)),
Projects.status
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name,
(CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)), Projects.status
ORDER BY title, ww";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

7
SubProject/FPJ0000/dsReport.xsd
View File

@@ -300,12 +300,13 @@ ORDER BY pdate</CommandText>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs,
Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)) AS PrjName
Projects.status AS PrjStatus, ISNULL(Projects.name, (CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END))
AS PrjName
FROM JobReport WITH (nolock) LEFT OUTER JOIN
Projects WITH (nolock) ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) &gt; 0)
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name, (CASE jobreport.[type] WHEN '휴가' THEN '휴가' ELSE Projects.name END)),
Projects.status
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), ISNULL(Projects.name,
(CASE WHEN jobreport.[type] = '휴가' THEN '휴가' WHEN jobreport.[type] LIKE '%미팅%' THEN '미팅' ELSE Projects.name END)), Projects.status
ORDER BY title, ww</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />

2
SubProject/FPJ0000/dsReport.xss
View File

@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="4" X="384" Y="301" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="1" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />