Egalware/admodelling.org
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix visualizzazione SOLO job completi e NON DELETED

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-10-31 12:19:06 +01:00
parent b9033dee88
commit 1652a1f9ab
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INTERFACE/WebLCP/DS_App.Designer.cs
Generated
+8 -1
View File
@@ -1178,6 +1178,7 @@ namespace WebLCP.DS_AppTableAdapters {
this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@USER_NAME", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@selectOnly", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = "dbo.stp_JL_getIncomp";
@@ -1252,7 +1253,7 @@ namespace WebLCP.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.JobsListDataTable getByUser(string USER_NAME) {
public virtual DS_App.JobsListDataTable getByUser(string USER_NAME, global::System.Nullable<bool> selectOnly) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((USER_NAME == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -1260,6 +1261,12 @@ namespace WebLCP.DS_AppTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(USER_NAME));
}
if ((selectOnly.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(selectOnly.Value));
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
DS_App.JobsListDataTable dataTable = new DS_App.JobsListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
INTERFACE/WebLCP/DS_App.xsd
+2 -1
View File
@@ -42,6 +42,7 @@
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@USER_NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@selectOnly" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -130,7 +131,7 @@
<xs:element name="DS_App" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_App" msprop:Generator_UserDSName="DS_App">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="JobsList" msprop:Generator_TableClassName="JobsListDataTable" msprop:Generator_TableVarName="tableJobsList" msprop:Generator_TablePropName="JobsList" msprop:Generator_RowDeletingName="JobsListRowDeleting" msprop:Generator_RowChangingName="JobsListRowChanging" msprop:Generator_RowEvHandlerName="JobsListRowChangeEventHandler" msprop:Generator_RowDeletedName="JobsListRowDeleted" msprop:Generator_UserTableName="JobsList" msprop:Generator_RowChangedName="JobsListRowChanged" msprop:Generator_RowEvArgName="JobsListRowChangeEvent" msprop:Generator_RowClassName="JobsListRow">
<xs:element name="JobsList" msprop:Generator_TableClassName="JobsListDataTable" msprop:Generator_TableVarName="tableJobsList" msprop:Generator_RowChangedName="JobsListRowChanged" msprop:Generator_TablePropName="JobsList" msprop:Generator_RowDeletingName="JobsListRowDeleting" msprop:Generator_RowChangingName="JobsListRowChanging" msprop:Generator_RowEvHandlerName="JobsListRowChangeEventHandler" msprop:Generator_RowDeletedName="JobsListRowDeleted" msprop:Generator_RowClassName="JobsListRow" msprop:Generator_UserTableName="JobsList" msprop:Generator_RowEvArgName="JobsListRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="JobId" msprop:Generator_ColumnVarNameInTable="columnJobId" msprop:Generator_ColumnPropNameInRow="JobId" msprop:Generator_ColumnPropNameInTable="JobIdColumn" msprop:Generator_UserColumnName="JobId" type="xs:int" />
INTERFACE/WebLCP/DS_App.xss
+1 -1
View File
@@ -6,7 +6,7 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:JobsList" ZOrder="1" X="467" Y="136" Height="536" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="352" />
<Shape ID="DesignTable:JobsList" ZOrder="1" X="467" Y="136" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
</Shapes>
<Connectors />
</DiagramLayout>
INTERFACE/WebLCP/WUC/mod_jobsList.ascx
+1
View File
@@ -60,6 +60,7 @@
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByUser" TypeName="WebLCP.DS_AppTableAdapters.JobsListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfUsr" DefaultValue="NA" Name="USER_NAME" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfSelectOnly" DefaultValue="0" Name="selectOnly" PropertyName="Value" Type="Boolean" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfUsr" />
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=63']) {
withEnv(['NEXT_BUILD_NUMBER=65']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'LCP'