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

..

Browse Source
This commit is contained in:
chi
2023-06-11 23:03:37 +09:00
parent d9e4974886
commit 800492b1a1
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("23.05.31.0830")]
[assembly: AssemblyFileVersion("23.05.31.0830")]
[assembly: AssemblyVersion("23.06.08.1140")]
[assembly: AssemblyFileVersion("23.06.08.1140")]

9
SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
View File

@@ -755,7 +755,14 @@ namespace FPJ0000.JobReport_
var oldtext = this.richTextBoxEx1.Text;
this.richTextBoxEx1.Rtf = dr.body;
if (String.IsNullOrEmpty(this.richTextBoxEx1.Text) == false)
this.richTextBoxEx1.Text += "\r\n\r\n" + oldtext;
{
this.richTextBoxEx1.rtb.AppendText("\n\n");
this.richTextBoxEx1.rtb.SelectionLength = 1;
this.richTextBoxEx1.rtb.SelectionStart = this.richTextBoxEx1.rtb.TextLength;
this.richTextBoxEx1.rtb.ForeColor = Color.Black;
this.richTextBoxEx1.rtb.AppendText(oldtext);
}
//this.richTextBoxEx1.Text += oldtext;
//this.richTextBoxEx1.Text += oldtext;

11
SubProject/FPJ0000/Project/DSProjectSummary.Designer.cs generated
View File

@@ -3468,14 +3468,11 @@ ORDER BY prj";
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT dbo.getUserName(championid) as username,championid
this._commandCollection[0].CommandText = @"SELECT dbo.getUserName(championid) AS username, championid
FROM Projects
WHERE gcode= @gcode
and championid is not null
and isnull(div,'') <> 'EB'
AND [status] in ('검토','보류','진행','완료')
group by championid,dbo.getUserName(championid)
order by username";
WHERE (gcode = @gcode) AND (ISNULL(div, '') <> 'EB') AND (status IN ('검토', '보류', '진행', '완료')) AND (ISNULL(championid, '') <> '')
GROUP BY championid, dbo.getUserName(championid)
ORDER BY username";
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, "", "", ""));
}

23
SubProject/FPJ0000/Project/DSProjectSummary.xsd
View File

@@ -45,15 +45,12 @@ ORDER BY prj</CommandText>
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT dbo.getUserName(championid) as username,championid
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT dbo.getUserName(championid) AS username, championid
FROM Projects
WHERE gcode= @gcode
and championid is not null
and isnull(div,'') &lt;&gt; 'EB'
AND [status] in ('검토','보류','진행','완료')
group by championid,dbo.getUserName(championid)
order by username</CommandText>
WHERE (gcode = @gcode) AND (ISNULL(div, '') &lt;&gt; 'EB') AND (status IN ('검토', '보류', '진행', '완료')) AND (ISNULL(championid, '') &lt;&gt; '')
GROUP BY championid, dbo.getUserName(championid)
ORDER BY username</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
@@ -139,10 +136,10 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH
<xs:element name="DSProjectSummary" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSProjectSummary" msprop:Generator_UserDSName="DSProjectSummary">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="ProjectHrs" msprop:Generator_TableClassName="ProjectHrsDataTable" msprop:Generator_TableVarName="tableProjectHrs" msprop:Generator_TablePropName="ProjectHrs" msprop:Generator_RowDeletingName="ProjectHrsRowDeleting" msprop:Generator_RowChangingName="ProjectHrsRowChanging" msprop:Generator_RowEvHandlerName="ProjectHrsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectHrsRowDeleted" msprop:Generator_UserTableName="ProjectHrs" msprop:Generator_RowChangedName="ProjectHrsRowChanged" msprop:Generator_RowEvArgName="ProjectHrsRowChangeEvent" msprop:Generator_RowClassName="ProjectHrsRow">
<xs:element name="ProjectHrs" msprop:Generator_TableClassName="ProjectHrsDataTable" msprop:Generator_TableVarName="tableProjectHrs" msprop:Generator_RowChangedName="ProjectHrsRowChanged" msprop:Generator_TablePropName="ProjectHrs" msprop:Generator_RowDeletingName="ProjectHrsRowDeleting" msprop:Generator_RowChangingName="ProjectHrsRowChanging" msprop:Generator_RowEvHandlerName="ProjectHrsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectHrsRowDeleted" msprop:Generator_RowClassName="ProjectHrsRow" msprop:Generator_UserTableName="ProjectHrs" msprop:Generator_RowEvArgName="ProjectHrsRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="prj" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnprj" msprop:Generator_ColumnPropNameInRow="prj" msprop:Generator_ColumnPropNameInTable="prjColumn" msprop:Generator_UserColumnName="prj" minOccurs="0">
<xs:element name="prj" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnprj" msprop:Generator_ColumnPropNameInRow="prj" msprop:Generator_ColumnPropNameInTable="prjColumn" msprop:Generator_UserColumnName="prj">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
@@ -155,7 +152,7 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProjectUserList" msprop:Generator_TableClassName="ProjectUserListDataTable" msprop:Generator_TableVarName="tableProjectUserList" msprop:Generator_TablePropName="ProjectUserList" msprop:Generator_RowDeletingName="ProjectUserListRowDeleting" msprop:Generator_RowChangingName="ProjectUserListRowChanging" msprop:Generator_RowEvHandlerName="ProjectUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectUserListRowDeleted" msprop:Generator_UserTableName="ProjectUserList" msprop:Generator_RowChangedName="ProjectUserListRowChanged" msprop:Generator_RowEvArgName="ProjectUserListRowChangeEvent" msprop:Generator_RowClassName="ProjectUserListRow">
<xs:element name="ProjectUserList" msprop:Generator_TableClassName="ProjectUserListDataTable" msprop:Generator_TableVarName="tableProjectUserList" msprop:Generator_RowChangedName="ProjectUserListRowChanged" msprop:Generator_TablePropName="ProjectUserList" msprop:Generator_RowDeletingName="ProjectUserListRowDeleting" msprop:Generator_RowChangingName="ProjectUserListRowChanging" msprop:Generator_RowEvHandlerName="ProjectUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectUserListRowDeleted" msprop:Generator_RowClassName="ProjectUserListRow" msprop:Generator_UserTableName="ProjectUserList" msprop:Generator_RowEvArgName="ProjectUserListRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="username" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnPropNameInTable="usernameColumn" msprop:Generator_UserColumnName="username" minOccurs="0">
@@ -165,7 +162,7 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="championid" msprop:Generator_ColumnVarNameInTable="columnchampionid" msprop:Generator_ColumnPropNameInRow="championid" msprop:Generator_ColumnPropNameInTable="championidColumn" msprop:Generator_UserColumnName="championid">
<xs:element name="championid" msprop:Generator_ColumnVarNameInTable="columnchampionid" msprop:Generator_ColumnPropNameInRow="championid" msprop:Generator_ColumnPropNameInTable="championidColumn" msprop:Generator_UserColumnName="championid" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
@@ -175,7 +172,7 @@ ORDER BY (CASE WHEN ([status] = '진행') THEN '0' WHEN ([status] = '검토') TH
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_RowClassName="ProjectsRow" msprop:Generator_UserTableName="Projects" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent">
<xs:element name="Projects" msprop:Generator_TableClassName="ProjectsDataTable" msprop:Generator_TableVarName="tableProjects" msprop:Generator_TablePropName="Projects" msprop:Generator_RowDeletingName="ProjectsRowDeleting" msprop:Generator_RowChangingName="ProjectsRowChanging" msprop:Generator_RowEvHandlerName="ProjectsRowChangeEventHandler" msprop:Generator_RowDeletedName="ProjectsRowDeleted" msprop:Generator_UserTableName="Projects" msprop:Generator_RowChangedName="ProjectsRowChanged" msprop:Generator_RowEvArgName="ProjectsRowChangeEvent" msprop:Generator_RowClassName="ProjectsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />