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

..

Browse Source
This commit is contained in:
chi
2022-08-23 11:36:32 +09:00
parent 4d7e6aeb63
commit 08b11b3b69
3 changed files with 7 additions and 7 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("22.07.28.1350")]
[assembly: AssemblyFileVersion("22.07.28.1350")]
[assembly: AssemblyVersion("22.08.23.1030")]
[assembly: AssemblyFileVersion("22.08.23.1030")]

2
SubProject/FBS0000/dsReport.Designer.cs generated
View File

@@ -2703,7 +2703,7 @@ namespace FBS0000.dsReportTableAdapters {
FROM Users INNER JOIN
Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed)
WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (EETGW_GroupUser.useUserState = 1)
ORDER BY Holyday.uid, CrDay";
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, "", "", ""));

8
SubProject/FBS0000/dsReport.xsd
View File

@@ -16,7 +16,7 @@
FROM Users INNER JOIN
Holyday ON Users.id = Holyday.uid LEFT OUTER JOIN
EETGW_GroupUser ON Holyday.uid = EETGW_GroupUser.uid AND Holyday.gcode = EETGW_GroupUser.gcode
WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed)
WHERE (Holyday.gcode = @gcode) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.level > 0) AND (EETGW_GroupUser.useUserState = 1)
ORDER BY Holyday.uid, CrDay</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -166,7 +166,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="holydata" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_UserTableName="holydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_RowEvArgName="holydataRowChangeEvent" msprop:Generator_RowClassName="holydataRow">
<xs:element name="holydata" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_RowClassName="holydataRow" msprop:Generator_UserTableName="holydata" msprop:Generator_RowEvArgName="holydataRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
@@ -211,7 +211,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_RowClassName="Holydata_DayRow" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent">
<xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent" msprop:Generator_RowClassName="Holydata_DayRow">
<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" />
@@ -265,7 +265,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_RowClassName="Holydata_TimeRow" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent">
<xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent" msprop:Generator_RowClassName="Holydata_TimeRow">
<xs:complexType>
<xs:sequence>
<xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">