Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-09-03 19:37:25 +02:00
parent b17eadabe6 8efedd84f8
commit 69d1d56e57
10 changed files with 223 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Data/DS_Applicazione.Designer.cs
Generated
+28 -2
View File
@@ -31476,13 +31476,15 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[0].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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@lastDate", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maxNum", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[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.Fill, true)]
public virtual int Fill(DS_Applicazione.HistTempDataTable dataTable, global::System.Nullable<int> idxDipendente) {
public virtual int Fill(DS_Applicazione.HistTempDataTable dataTable, global::System.Nullable<int> idxDipendente, global::System.Nullable<global::System.DateTime> lastDate, global::System.Nullable<int> maxNum) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((idxDipendente.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDipendente.Value));
@@ -31490,6 +31492,18 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
else {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
if ((lastDate.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(lastDate.Value));
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
if ((maxNum.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(maxNum.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -31501,7 +31515,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
[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, true)]
public virtual DS_Applicazione.HistTempDataTable GetData(global::System.Nullable<int> idxDipendente) {
public virtual DS_Applicazione.HistTempDataTable GetData(global::System.Nullable<int> idxDipendente, global::System.Nullable<global::System.DateTime> lastDate, global::System.Nullable<int> maxNum) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((idxDipendente.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDipendente.Value));
@@ -31509,6 +31523,18 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
else {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
if ((lastDate.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(lastDate.Value));
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
if ((maxNum.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(maxNum.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
DS_Applicazione.HistTempDataTable dataTable = new DS_Applicazione.HistTempDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
GPW_Data/DS_Applicazione.xsd
+31 -29
View File
@@ -2837,13 +2837,15 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="HistTempTableAdapter" GeneratorDataComponentClassName="HistTempTableAdapter" Name="HistTemp" UserDataComponentName="HistTempTableAdapter">
<MainSource>
<DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_RT_getHistByUser" DbObjectType="StoredProcedure" 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">
<DbSource ConnectionRef="GPWConnectionString (Settings)" DbObjectName="GPW.dbo.stp_RT_getHistByUser" DbObjectType="StoredProcedure" 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="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_RT_getHistByUser</CommandText>
<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="int" DbType="Int32" Direction="Input" ParameterName="@idxDipendente" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@lastDate" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@maxNum" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -2863,7 +2865,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
<xs:element name="DS_Applicazione" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_Applicazione" msprop:Generator_UserDSName="DS_Applicazione">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="Timbrature" msprop:Generator_TableClassName="TimbratureDataTable" msprop:Generator_TableVarName="tableTimbrature" msprop:Generator_TablePropName="Timbrature" msprop:Generator_RowDeletingName="TimbratureRowDeleting" msprop:Generator_RowChangingName="TimbratureRowChanging" msprop:Generator_RowEvHandlerName="TimbratureRowChangeEventHandler" msprop:Generator_RowDeletedName="TimbratureRowDeleted" msprop:Generator_UserTableName="Timbrature" msprop:Generator_RowChangedName="TimbratureRowChanged" msprop:Generator_RowEvArgName="TimbratureRowChangeEvent" msprop:Generator_RowClassName="TimbratureRow">
<xs:element name="Timbrature" msprop:Generator_TableClassName="TimbratureDataTable" msprop:Generator_TableVarName="tableTimbrature" msprop:Generator_RowChangedName="TimbratureRowChanged" msprop:Generator_TablePropName="Timbrature" msprop:Generator_RowDeletingName="TimbratureRowDeleting" msprop:Generator_RowChangingName="TimbratureRowChanging" msprop:Generator_RowEvHandlerName="TimbratureRowChangeEventHandler" msprop:Generator_RowDeletedName="TimbratureRowDeleted" msprop:Generator_RowClassName="TimbratureRow" msprop:Generator_UserTableName="Timbrature" msprop:Generator_RowEvArgName="TimbratureRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="dataOra" msprop:Generator_ColumnVarNameInTable="columndataOra" msprop:Generator_ColumnPropNameInRow="dataOra" msprop:Generator_ColumnPropNameInTable="dataOraColumn" msprop:Generator_UserColumnName="dataOra" type="xs:dateTime" />
@@ -2887,7 +2889,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="TimbratureExpl" msprop:Generator_TableClassName="TimbratureExplDataTable" msprop:Generator_TableVarName="tableTimbratureExpl" msprop:Generator_TablePropName="TimbratureExpl" msprop:Generator_RowDeletingName="TimbratureExplRowDeleting" msprop:Generator_RowChangingName="TimbratureExplRowChanging" msprop:Generator_RowEvHandlerName="TimbratureExplRowChangeEventHandler" msprop:Generator_RowDeletedName="TimbratureExplRowDeleted" msprop:Generator_UserTableName="TimbratureExpl" msprop:Generator_RowChangedName="TimbratureExplRowChanged" msprop:Generator_RowEvArgName="TimbratureExplRowChangeEvent" msprop:Generator_RowClassName="TimbratureExplRow">
<xs:element name="TimbratureExpl" msprop:Generator_TableClassName="TimbratureExplDataTable" msprop:Generator_TableVarName="tableTimbratureExpl" msprop:Generator_RowChangedName="TimbratureExplRowChanged" msprop:Generator_TablePropName="TimbratureExpl" msprop:Generator_RowDeletingName="TimbratureExplRowDeleting" msprop:Generator_RowChangingName="TimbratureExplRowChanging" msprop:Generator_RowEvHandlerName="TimbratureExplRowChangeEventHandler" msprop:Generator_RowDeletedName="TimbratureExplRowDeleted" msprop:Generator_RowClassName="TimbratureExplRow" msprop:Generator_UserTableName="TimbratureExpl" msprop:Generator_RowEvArgName="TimbratureExplRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="dataLav" msprop:Generator_ColumnVarNameInTable="columndataLav" msprop:Generator_ColumnPropNameInRow="dataLav" msprop:Generator_ColumnPropNameInTable="dataLavColumn" msprop:Generator_UserColumnName="dataLav" type="xs:dateTime" />
@@ -2944,7 +2946,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagDevices" msprop:Generator_TableClassName="AnagDevicesDataTable" msprop:Generator_TableVarName="tableAnagDevices" msprop:Generator_TablePropName="AnagDevices" msprop:Generator_RowDeletingName="AnagDevicesRowDeleting" msprop:Generator_RowChangingName="AnagDevicesRowChanging" msprop:Generator_RowEvHandlerName="AnagDevicesRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagDevicesRowDeleted" msprop:Generator_UserTableName="AnagDevices" msprop:Generator_RowChangedName="AnagDevicesRowChanged" msprop:Generator_RowEvArgName="AnagDevicesRowChangeEvent" msprop:Generator_RowClassName="AnagDevicesRow">
<xs:element name="AnagDevices" msprop:Generator_TableClassName="AnagDevicesDataTable" msprop:Generator_TableVarName="tableAnagDevices" msprop:Generator_RowChangedName="AnagDevicesRowChanged" msprop:Generator_TablePropName="AnagDevices" msprop:Generator_RowDeletingName="AnagDevicesRowDeleting" msprop:Generator_RowChangingName="AnagDevicesRowChanging" msprop:Generator_RowEvHandlerName="AnagDevicesRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagDevicesRowDeleted" msprop:Generator_RowClassName="AnagDevicesRow" msprop:Generator_UserTableName="AnagDevices" msprop:Generator_RowEvArgName="AnagDevicesRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="IdxDevice" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxDevice" msprop:Generator_ColumnPropNameInRow="IdxDevice" msprop:Generator_ColumnPropNameInTable="IdxDeviceColumn" msprop:Generator_UserColumnName="IdxDevice" type="xs:int" />
@@ -2982,7 +2984,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Dipendenti" msprop:Generator_TableClassName="DipendentiDataTable" msprop:Generator_TableVarName="tableDipendenti" msprop:Generator_TablePropName="Dipendenti" msprop:Generator_RowDeletingName="DipendentiRowDeleting" msprop:Generator_RowChangingName="DipendentiRowChanging" msprop:Generator_RowEvHandlerName="DipendentiRowChangeEventHandler" msprop:Generator_RowDeletedName="DipendentiRowDeleted" msprop:Generator_UserTableName="Dipendenti" msprop:Generator_RowChangedName="DipendentiRowChanged" msprop:Generator_RowEvArgName="DipendentiRowChangeEvent" msprop:Generator_RowClassName="DipendentiRow">
<xs:element name="Dipendenti" msprop:Generator_TableClassName="DipendentiDataTable" msprop:Generator_TableVarName="tableDipendenti" msprop:Generator_RowChangedName="DipendentiRowChanged" msprop:Generator_TablePropName="Dipendenti" msprop:Generator_RowDeletingName="DipendentiRowDeleting" msprop:Generator_RowChangingName="DipendentiRowChanging" msprop:Generator_RowEvHandlerName="DipendentiRowChangeEventHandler" msprop:Generator_RowDeletedName="DipendentiRowDeleted" msprop:Generator_RowClassName="DipendentiRow" msprop:Generator_UserTableName="Dipendenti" msprop:Generator_RowEvArgName="DipendentiRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idxDipendente" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxDipendente" msprop:Generator_ColumnPropNameInRow="idxDipendente" msprop:Generator_ColumnPropNameInTable="idxDipendenteColumn" msprop:Generator_UserColumnName="idxDipendente" type="xs:int" />
@@ -3110,7 +3112,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagClienti" msprop:Generator_TableClassName="AnagClientiDataTable" msprop:Generator_TableVarName="tableAnagClienti" msprop:Generator_RowChangedName="AnagClientiRowChanged" msprop:Generator_TablePropName="AnagClienti" msprop:Generator_RowDeletingName="AnagClientiRowDeleting" msprop:Generator_RowChangingName="AnagClientiRowChanging" msprop:Generator_RowEvHandlerName="AnagClientiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagClientiRowDeleted" msprop:Generator_RowClassName="AnagClientiRow" msprop:Generator_UserTableName="AnagClienti" msprop:Generator_RowEvArgName="AnagClientiRowChangeEvent">
<xs:element name="AnagClienti" msprop:Generator_TableClassName="AnagClientiDataTable" msprop:Generator_TableVarName="tableAnagClienti" msprop:Generator_TablePropName="AnagClienti" msprop:Generator_RowDeletingName="AnagClientiRowDeleting" msprop:Generator_RowChangingName="AnagClientiRowChanging" msprop:Generator_RowEvHandlerName="AnagClientiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagClientiRowDeleted" msprop:Generator_UserTableName="AnagClienti" msprop:Generator_RowChangedName="AnagClientiRowChanged" msprop:Generator_RowEvArgName="AnagClientiRowChangeEvent" msprop:Generator_RowClassName="AnagClientiRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxCliente" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxCliente" msprop:Generator_ColumnPropNameInRow="idxCliente" msprop:Generator_ColumnPropNameInTable="idxClienteColumn" msprop:Generator_UserColumnName="idxCliente" type="xs:int" />
@@ -3203,7 +3205,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagProgetti" msprop:Generator_TableClassName="AnagProgettiDataTable" msprop:Generator_TableVarName="tableAnagProgetti" msprop:Generator_RowChangedName="AnagProgettiRowChanged" msprop:Generator_TablePropName="AnagProgetti" msprop:Generator_RowDeletingName="AnagProgettiRowDeleting" msprop:Generator_RowChangingName="AnagProgettiRowChanging" msprop:Generator_RowEvHandlerName="AnagProgettiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagProgettiRowDeleted" msprop:Generator_RowClassName="AnagProgettiRow" msprop:Generator_UserTableName="AnagProgetti" msprop:Generator_RowEvArgName="AnagProgettiRowChangeEvent">
<xs:element name="AnagProgetti" msprop:Generator_TableClassName="AnagProgettiDataTable" msprop:Generator_TableVarName="tableAnagProgetti" msprop:Generator_TablePropName="AnagProgetti" msprop:Generator_RowDeletingName="AnagProgettiRowDeleting" msprop:Generator_RowChangingName="AnagProgettiRowChanging" msprop:Generator_RowEvHandlerName="AnagProgettiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagProgettiRowDeleted" msprop:Generator_UserTableName="AnagProgetti" msprop:Generator_RowChangedName="AnagProgettiRowChanged" msprop:Generator_RowEvArgName="AnagProgettiRowChangeEvent" msprop:Generator_RowClassName="AnagProgettiRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxProgetto" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnidxProgetto" msprop:Generator_ColumnPropNameInRow="idxProgetto" msprop:Generator_ColumnPropNameInTable="idxProgettoColumn" msprop:Generator_UserColumnName="idxProgetto" type="xs:int" />
@@ -3248,7 +3250,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Dipendenti2Ruoli" msprop:Generator_TableClassName="Dipendenti2RuoliDataTable" msprop:Generator_TableVarName="tableDipendenti2Ruoli" msprop:Generator_RowChangedName="Dipendenti2RuoliRowChanged" msprop:Generator_TablePropName="Dipendenti2Ruoli" msprop:Generator_RowDeletingName="Dipendenti2RuoliRowDeleting" msprop:Generator_RowChangingName="Dipendenti2RuoliRowChanging" msprop:Generator_RowEvHandlerName="Dipendenti2RuoliRowChangeEventHandler" msprop:Generator_RowDeletedName="Dipendenti2RuoliRowDeleted" msprop:Generator_RowClassName="Dipendenti2RuoliRow" msprop:Generator_UserTableName="Dipendenti2Ruoli" msprop:Generator_RowEvArgName="Dipendenti2RuoliRowChangeEvent">
<xs:element name="Dipendenti2Ruoli" msprop:Generator_TableClassName="Dipendenti2RuoliDataTable" msprop:Generator_TableVarName="tableDipendenti2Ruoli" msprop:Generator_TablePropName="Dipendenti2Ruoli" msprop:Generator_RowDeletingName="Dipendenti2RuoliRowDeleting" msprop:Generator_RowChangingName="Dipendenti2RuoliRowChanging" msprop:Generator_RowEvHandlerName="Dipendenti2RuoliRowChangeEventHandler" msprop:Generator_RowDeletedName="Dipendenti2RuoliRowDeleted" msprop:Generator_UserTableName="Dipendenti2Ruoli" msprop:Generator_RowChangedName="Dipendenti2RuoliRowChanged" msprop:Generator_RowEvArgName="Dipendenti2RuoliRowChangeEvent" msprop:Generator_RowClassName="Dipendenti2RuoliRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxDipendente" msprop:Generator_ColumnVarNameInTable="columnidxDipendente" msprop:Generator_ColumnPropNameInRow="idxDipendente" msprop:Generator_ColumnPropNameInTable="idxDipendenteColumn" msprop:Generator_UserColumnName="idxDipendente" type="xs:int" />
@@ -3262,7 +3264,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagFasi" msprop:Generator_TableClassName="AnagFasiDataTable" msprop:Generator_TableVarName="tableAnagFasi" msprop:Generator_RowChangedName="AnagFasiRowChanged" msprop:Generator_TablePropName="AnagFasi" msprop:Generator_RowDeletingName="AnagFasiRowDeleting" msprop:Generator_RowChangingName="AnagFasiRowChanging" msprop:Generator_RowEvHandlerName="AnagFasiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagFasiRowDeleted" msprop:Generator_RowClassName="AnagFasiRow" msprop:Generator_UserTableName="AnagFasi" msprop:Generator_RowEvArgName="AnagFasiRowChangeEvent">
<xs:element name="AnagFasi" msprop:Generator_TableClassName="AnagFasiDataTable" msprop:Generator_TableVarName="tableAnagFasi" msprop:Generator_TablePropName="AnagFasi" msprop:Generator_RowDeletingName="AnagFasiRowDeleting" msprop:Generator_RowChangingName="AnagFasiRowChanging" msprop:Generator_RowEvHandlerName="AnagFasiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagFasiRowDeleted" msprop:Generator_UserTableName="AnagFasi" msprop:Generator_RowChangedName="AnagFasiRowChanged" msprop:Generator_RowEvArgName="AnagFasiRowChangeEvent" msprop:Generator_RowClassName="AnagFasiRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxFase" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxFase" msprop:Generator_ColumnPropNameInRow="idxFase" msprop:Generator_ColumnPropNameInTable="idxFaseColumn" msprop:Generator_UserColumnName="idxFase" type="xs:int" />
@@ -3312,7 +3314,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="v_logCommUt" msprop:Generator_TableClassName="v_logCommUtDataTable" msprop:Generator_TableVarName="tablev_logCommUt" msprop:Generator_TablePropName="v_logCommUt" msprop:Generator_RowDeletingName="v_logCommUtRowDeleting" msprop:Generator_RowChangingName="v_logCommUtRowChanging" msprop:Generator_RowEvHandlerName="v_logCommUtRowChangeEventHandler" msprop:Generator_RowDeletedName="v_logCommUtRowDeleted" msprop:Generator_UserTableName="v_logCommUt" msprop:Generator_RowChangedName="v_logCommUtRowChanged" msprop:Generator_RowEvArgName="v_logCommUtRowChangeEvent" msprop:Generator_RowClassName="v_logCommUtRow">
<xs:element name="v_logCommUt" msprop:Generator_TableClassName="v_logCommUtDataTable" msprop:Generator_TableVarName="tablev_logCommUt" msprop:Generator_RowChangedName="v_logCommUtRowChanged" msprop:Generator_TablePropName="v_logCommUt" msprop:Generator_RowDeletingName="v_logCommUtRowDeleting" msprop:Generator_RowChangingName="v_logCommUtRowChanging" msprop:Generator_RowEvHandlerName="v_logCommUtRowChangeEventHandler" msprop:Generator_RowDeletedName="v_logCommUtRowDeleted" msprop:Generator_RowClassName="v_logCommUtRow" msprop:Generator_UserTableName="v_logCommUt" msprop:Generator_RowEvArgName="v_logCommUtRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="Data" msdata:Caption="dataLav" msprop:Generator_ColumnVarNameInTable="columnData" msprop:Generator_ColumnPropNameInRow="Data" msprop:Generator_ColumnPropNameInTable="DataColumn" msprop:Generator_UserColumnName="Data" type="xs:dateTime" />
@@ -3348,7 +3350,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="RegAttivita" msprop:Generator_TableClassName="RegAttivitaDataTable" msprop:Generator_TableVarName="tableRegAttivita" msprop:Generator_RowChangedName="RegAttivitaRowChanged" msprop:Generator_TablePropName="RegAttivita" msprop:Generator_RowDeletingName="RegAttivitaRowDeleting" msprop:Generator_RowChangingName="RegAttivitaRowChanging" msprop:Generator_RowEvHandlerName="RegAttivitaRowChangeEventHandler" msprop:Generator_RowDeletedName="RegAttivitaRowDeleted" msprop:Generator_RowClassName="RegAttivitaRow" msprop:Generator_UserTableName="RegAttivita" msprop:Generator_RowEvArgName="RegAttivitaRowChangeEvent">
<xs:element name="RegAttivita" msprop:Generator_TableClassName="RegAttivitaDataTable" msprop:Generator_TableVarName="tableRegAttivita" msprop:Generator_TablePropName="RegAttivita" msprop:Generator_RowDeletingName="RegAttivitaRowDeleting" msprop:Generator_RowChangingName="RegAttivitaRowChanging" msprop:Generator_RowEvHandlerName="RegAttivitaRowChangeEventHandler" msprop:Generator_RowDeletedName="RegAttivitaRowDeleted" msprop:Generator_UserTableName="RegAttivita" msprop:Generator_RowChangedName="RegAttivitaRowChanged" msprop:Generator_RowEvArgName="RegAttivitaRowChangeEvent" msprop:Generator_RowClassName="RegAttivitaRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxRA" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxRA" msprop:Generator_ColumnPropNameInRow="idxRA" msprop:Generator_ColumnPropNameInTable="idxRAColumn" msprop:Generator_UserColumnName="idxRA" type="xs:int" />
@@ -3368,7 +3370,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CalendFesteFerie" msprop:Generator_TableClassName="CalendFesteFerieDataTable" msprop:Generator_TableVarName="tableCalendFesteFerie" msprop:Generator_RowChangedName="CalendFesteFerieRowChanged" msprop:Generator_TablePropName="CalendFesteFerie" msprop:Generator_RowDeletingName="CalendFesteFerieRowDeleting" msprop:Generator_RowChangingName="CalendFesteFerieRowChanging" msprop:Generator_RowEvHandlerName="CalendFesteFerieRowChangeEventHandler" msprop:Generator_RowDeletedName="CalendFesteFerieRowDeleted" msprop:Generator_RowClassName="CalendFesteFerieRow" msprop:Generator_UserTableName="CalendFesteFerie" msprop:Generator_RowEvArgName="CalendFesteFerieRowChangeEvent">
<xs:element name="CalendFesteFerie" msprop:Generator_TableClassName="CalendFesteFerieDataTable" msprop:Generator_TableVarName="tableCalendFesteFerie" msprop:Generator_TablePropName="CalendFesteFerie" msprop:Generator_RowDeletingName="CalendFesteFerieRowDeleting" msprop:Generator_RowChangingName="CalendFesteFerieRowChanging" msprop:Generator_RowEvHandlerName="CalendFesteFerieRowChangeEventHandler" msprop:Generator_RowDeletedName="CalendFesteFerieRowDeleted" msprop:Generator_UserTableName="CalendFesteFerie" msprop:Generator_RowChangedName="CalendFesteFerieRowChanged" msprop:Generator_RowEvArgName="CalendFesteFerieRowChangeEvent" msprop:Generator_RowClassName="CalendFesteFerieRow">
<xs:complexType>
<xs:sequence>
<xs:element name="data" msprop:Generator_ColumnVarNameInTable="columndata" msprop:Generator_ColumnPropNameInRow="data" msprop:Generator_ColumnPropNameInTable="dataColumn" msprop:Generator_UserColumnName="data" type="xs:dateTime" />
@@ -3389,7 +3391,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagOrari" msprop:Generator_TableClassName="AnagOrariDataTable" msprop:Generator_TableVarName="tableAnagOrari" msprop:Generator_RowChangedName="AnagOrariRowChanged" msprop:Generator_TablePropName="AnagOrari" msprop:Generator_RowDeletingName="AnagOrariRowDeleting" msprop:Generator_RowChangingName="AnagOrariRowChanging" msprop:Generator_RowEvHandlerName="AnagOrariRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagOrariRowDeleted" msprop:Generator_RowClassName="AnagOrariRow" msprop:Generator_UserTableName="AnagOrari" msprop:Generator_RowEvArgName="AnagOrariRowChangeEvent">
<xs:element name="AnagOrari" msprop:Generator_TableClassName="AnagOrariDataTable" msprop:Generator_TableVarName="tableAnagOrari" msprop:Generator_TablePropName="AnagOrari" msprop:Generator_RowDeletingName="AnagOrariRowDeleting" msprop:Generator_RowChangingName="AnagOrariRowChanging" msprop:Generator_RowEvHandlerName="AnagOrariRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagOrariRowDeleted" msprop:Generator_UserTableName="AnagOrari" msprop:Generator_RowChangedName="AnagOrariRowChanged" msprop:Generator_RowEvArgName="AnagOrariRowChangeEvent" msprop:Generator_RowClassName="AnagOrariRow">
<xs:complexType>
<xs:sequence>
<xs:element name="codOrario" msprop:Generator_ColumnVarNameInTable="columncodOrario" msprop:Generator_ColumnPropNameInRow="codOrario" msprop:Generator_ColumnPropNameInTable="codOrarioColumn" msprop:Generator_UserColumnName="codOrario">
@@ -3425,7 +3427,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="TimbMeseExpl" msprop:Generator_TableClassName="TimbMeseExplDataTable" msprop:Generator_TableVarName="tableTimbMeseExpl" msprop:Generator_TablePropName="TimbMeseExpl" msprop:Generator_RowDeletingName="TimbMeseExplRowDeleting" msprop:Generator_RowChangingName="TimbMeseExplRowChanging" msprop:Generator_RowEvHandlerName="TimbMeseExplRowChangeEventHandler" msprop:Generator_RowDeletedName="TimbMeseExplRowDeleted" msprop:Generator_UserTableName="TimbMeseExpl" msprop:Generator_RowChangedName="TimbMeseExplRowChanged" msprop:Generator_RowEvArgName="TimbMeseExplRowChangeEvent" msprop:Generator_RowClassName="TimbMeseExplRow">
<xs:element name="TimbMeseExpl" msprop:Generator_TableClassName="TimbMeseExplDataTable" msprop:Generator_TableVarName="tableTimbMeseExpl" msprop:Generator_RowChangedName="TimbMeseExplRowChanged" msprop:Generator_TablePropName="TimbMeseExpl" msprop:Generator_RowDeletingName="TimbMeseExplRowDeleting" msprop:Generator_RowChangingName="TimbMeseExplRowChanging" msprop:Generator_RowEvHandlerName="TimbMeseExplRowChangeEventHandler" msprop:Generator_RowDeletedName="TimbMeseExplRowDeleted" msprop:Generator_RowClassName="TimbMeseExplRow" msprop:Generator_UserTableName="TimbMeseExpl" msprop:Generator_RowEvArgName="TimbMeseExplRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="Anno" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnAnno" msprop:Generator_ColumnPropNameInRow="Anno" msprop:Generator_ColumnPropNameInTable="AnnoColumn" msprop:Generator_UserColumnName="Anno" type="xs:int" />
@@ -3450,7 +3452,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Giustificativi" msprop:Generator_TableClassName="GiustificativiDataTable" msprop:Generator_TableVarName="tableGiustificativi" msprop:Generator_TablePropName="Giustificativi" msprop:Generator_RowDeletingName="GiustificativiRowDeleting" msprop:Generator_RowChangingName="GiustificativiRowChanging" msprop:Generator_RowEvHandlerName="GiustificativiRowChangeEventHandler" msprop:Generator_RowDeletedName="GiustificativiRowDeleted" msprop:Generator_UserTableName="Giustificativi" msprop:Generator_RowChangedName="GiustificativiRowChanged" msprop:Generator_RowEvArgName="GiustificativiRowChangeEvent" msprop:Generator_RowClassName="GiustificativiRow">
<xs:element name="Giustificativi" msprop:Generator_TableClassName="GiustificativiDataTable" msprop:Generator_TableVarName="tableGiustificativi" msprop:Generator_RowChangedName="GiustificativiRowChanged" msprop:Generator_TablePropName="Giustificativi" msprop:Generator_RowDeletingName="GiustificativiRowDeleting" msprop:Generator_RowChangingName="GiustificativiRowChanging" msprop:Generator_RowEvHandlerName="GiustificativiRowChangeEventHandler" msprop:Generator_RowDeletedName="GiustificativiRowDeleted" msprop:Generator_RowClassName="GiustificativiRow" msprop:Generator_UserTableName="Giustificativi" msprop:Generator_RowEvArgName="GiustificativiRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="dataLav" msprop:Generator_ColumnVarNameInTable="columndataLav" msprop:Generator_ColumnPropNameInRow="dataLav" msprop:Generator_ColumnPropNameInTable="dataLavColumn" msprop:Generator_UserColumnName="dataLav" type="xs:dateTime" />
@@ -3466,7 +3468,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="stp_DipendentiAndAnomalie" msprop:Generator_TableClassName="stp_DipendentiAndAnomalieDataTable" msprop:Generator_TableVarName="tablestp_DipendentiAndAnomalie" msprop:Generator_TablePropName="stp_DipendentiAndAnomalie" msprop:Generator_RowDeletingName="stp_DipendentiAndAnomalieRowDeleting" msprop:Generator_RowChangingName="stp_DipendentiAndAnomalieRowChanging" msprop:Generator_RowEvHandlerName="stp_DipendentiAndAnomalieRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_DipendentiAndAnomalieRowDeleted" msprop:Generator_UserTableName="stp_DipendentiAndAnomalie" msprop:Generator_RowChangedName="stp_DipendentiAndAnomalieRowChanged" msprop:Generator_RowEvArgName="stp_DipendentiAndAnomalieRowChangeEvent" msprop:Generator_RowClassName="stp_DipendentiAndAnomalieRow">
<xs:element name="stp_DipendentiAndAnomalie" msprop:Generator_TableClassName="stp_DipendentiAndAnomalieDataTable" msprop:Generator_TableVarName="tablestp_DipendentiAndAnomalie" msprop:Generator_RowChangedName="stp_DipendentiAndAnomalieRowChanged" msprop:Generator_TablePropName="stp_DipendentiAndAnomalie" msprop:Generator_RowDeletingName="stp_DipendentiAndAnomalieRowDeleting" msprop:Generator_RowChangingName="stp_DipendentiAndAnomalieRowChanging" msprop:Generator_RowEvHandlerName="stp_DipendentiAndAnomalieRowChangeEventHandler" msprop:Generator_RowDeletedName="stp_DipendentiAndAnomalieRowDeleted" msprop:Generator_RowClassName="stp_DipendentiAndAnomalieRow" msprop:Generator_UserTableName="stp_DipendentiAndAnomalie" msprop:Generator_RowEvArgName="stp_DipendentiAndAnomalieRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idxDipendente" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnidxDipendente" msprop:Generator_ColumnPropNameInRow="idxDipendente" msprop:Generator_ColumnPropNameInTable="idxDipendenteColumn" msprop:Generator_UserColumnName="idxDipendente" type="xs:int" />
@@ -3487,7 +3489,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="TE_RA_Expl" msprop:Generator_TableClassName="TE_RA_ExplDataTable" msprop:Generator_TableVarName="tableTE_RA_Expl" msprop:Generator_TablePropName="TE_RA_Expl" msprop:Generator_RowDeletingName="TE_RA_ExplRowDeleting" msprop:Generator_RowChangingName="TE_RA_ExplRowChanging" msprop:Generator_RowEvHandlerName="TE_RA_ExplRowChangeEventHandler" msprop:Generator_RowDeletedName="TE_RA_ExplRowDeleted" msprop:Generator_UserTableName="TE_RA_Expl" msprop:Generator_RowChangedName="TE_RA_ExplRowChanged" msprop:Generator_RowEvArgName="TE_RA_ExplRowChangeEvent" msprop:Generator_RowClassName="TE_RA_ExplRow">
<xs:element name="TE_RA_Expl" msprop:Generator_TableClassName="TE_RA_ExplDataTable" msprop:Generator_TableVarName="tableTE_RA_Expl" msprop:Generator_RowChangedName="TE_RA_ExplRowChanged" msprop:Generator_TablePropName="TE_RA_Expl" msprop:Generator_RowDeletingName="TE_RA_ExplRowDeleting" msprop:Generator_RowChangingName="TE_RA_ExplRowChanging" msprop:Generator_RowEvHandlerName="TE_RA_ExplRowChangeEventHandler" msprop:Generator_RowDeletedName="TE_RA_ExplRowDeleted" msprop:Generator_RowClassName="TE_RA_ExplRow" msprop:Generator_UserTableName="TE_RA_Expl" msprop:Generator_RowEvArgName="TE_RA_ExplRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="dataLav" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columndataLav" msprop:Generator_ColumnPropNameInRow="dataLav" msprop:Generator_ColumnPropNameInTable="dataLavColumn" msprop:Generator_UserColumnName="dataLav" type="xs:dateTime" />
@@ -3552,7 +3554,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="regAttDayExpl" msprop:Generator_TableClassName="regAttDayExplDataTable" msprop:Generator_TableVarName="tableregAttDayExpl" msprop:Generator_TablePropName="regAttDayExpl" msprop:Generator_RowDeletingName="regAttDayExplRowDeleting" msprop:Generator_RowChangingName="regAttDayExplRowChanging" msprop:Generator_RowEvHandlerName="regAttDayExplRowChangeEventHandler" msprop:Generator_RowDeletedName="regAttDayExplRowDeleted" msprop:Generator_UserTableName="regAttDayExpl" msprop:Generator_RowChangedName="regAttDayExplRowChanged" msprop:Generator_RowEvArgName="regAttDayExplRowChangeEvent" msprop:Generator_RowClassName="regAttDayExplRow">
<xs:element name="regAttDayExpl" msprop:Generator_TableClassName="regAttDayExplDataTable" msprop:Generator_TableVarName="tableregAttDayExpl" msprop:Generator_RowChangedName="regAttDayExplRowChanged" msprop:Generator_TablePropName="regAttDayExpl" msprop:Generator_RowDeletingName="regAttDayExplRowDeleting" msprop:Generator_RowChangingName="regAttDayExplRowChanging" msprop:Generator_RowEvHandlerName="regAttDayExplRowChangeEventHandler" msprop:Generator_RowDeletedName="regAttDayExplRowDeleted" msprop:Generator_RowClassName="regAttDayExplRow" msprop:Generator_UserTableName="regAttDayExpl" msprop:Generator_RowEvArgName="regAttDayExplRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idxDipendente" msprop:Generator_ColumnVarNameInTable="columnidxDipendente" msprop:Generator_ColumnPropNameInRow="idxDipendente" msprop:Generator_ColumnPropNameInTable="idxDipendenteColumn" msprop:Generator_UserColumnName="idxDipendente" type="xs:int" />
@@ -3600,7 +3602,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagProgetti_Expl" msprop:Generator_TableClassName="AnagProgetti_ExplDataTable" msprop:Generator_TableVarName="tableAnagProgetti_Expl" msprop:Generator_RowChangedName="AnagProgetti_ExplRowChanged" msprop:Generator_TablePropName="AnagProgetti_Expl" msprop:Generator_RowDeletingName="AnagProgetti_ExplRowDeleting" msprop:Generator_RowChangingName="AnagProgetti_ExplRowChanging" msprop:Generator_RowEvHandlerName="AnagProgetti_ExplRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagProgetti_ExplRowDeleted" msprop:Generator_RowClassName="AnagProgetti_ExplRow" msprop:Generator_UserTableName="AnagProgetti_Expl" msprop:Generator_RowEvArgName="AnagProgetti_ExplRowChangeEvent">
<xs:element name="AnagProgetti_Expl" msprop:Generator_TableClassName="AnagProgetti_ExplDataTable" msprop:Generator_TableVarName="tableAnagProgetti_Expl" msprop:Generator_TablePropName="AnagProgetti_Expl" msprop:Generator_RowDeletingName="AnagProgetti_ExplRowDeleting" msprop:Generator_RowChangingName="AnagProgetti_ExplRowChanging" msprop:Generator_RowEvHandlerName="AnagProgetti_ExplRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagProgetti_ExplRowDeleted" msprop:Generator_UserTableName="AnagProgetti_Expl" msprop:Generator_RowChangedName="AnagProgetti_ExplRowChanged" msprop:Generator_RowEvArgName="AnagProgetti_ExplRowChangeEvent" msprop:Generator_RowClassName="AnagProgetti_ExplRow">
<xs:complexType>
<xs:sequence>
<xs:element name="RagSociale" msprop:Generator_ColumnVarNameInTable="columnRagSociale" msprop:Generator_ColumnPropNameInRow="RagSociale" msprop:Generator_ColumnPropNameInTable="RagSocialeColumn" msprop:Generator_UserColumnName="RagSociale" minOccurs="0">
@@ -3641,7 +3643,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="RegistroEventi" msprop:Generator_TableClassName="RegistroEventiDataTable" msprop:Generator_TableVarName="tableRegistroEventi" msprop:Generator_TablePropName="RegistroEventi" msprop:Generator_RowDeletingName="RegistroEventiRowDeleting" msprop:Generator_RowChangingName="RegistroEventiRowChanging" msprop:Generator_RowEvHandlerName="RegistroEventiRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroEventiRowDeleted" msprop:Generator_UserTableName="RegistroEventi" msprop:Generator_RowChangedName="RegistroEventiRowChanged" msprop:Generator_RowEvArgName="RegistroEventiRowChangeEvent" msprop:Generator_RowClassName="RegistroEventiRow">
<xs:element name="RegistroEventi" msprop:Generator_TableClassName="RegistroEventiDataTable" msprop:Generator_TableVarName="tableRegistroEventi" msprop:Generator_RowChangedName="RegistroEventiRowChanged" msprop:Generator_TablePropName="RegistroEventi" msprop:Generator_RowDeletingName="RegistroEventiRowDeleting" msprop:Generator_RowChangingName="RegistroEventiRowChanging" msprop:Generator_RowEvHandlerName="RegistroEventiRowChangeEventHandler" msprop:Generator_RowDeletedName="RegistroEventiRowDeleted" msprop:Generator_RowClassName="RegistroEventiRow" msprop:Generator_UserTableName="RegistroEventi" msprop:Generator_RowEvArgName="RegistroEventiRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="DataOra" msprop:Generator_ColumnVarNameInTable="columnDataOra" msprop:Generator_ColumnPropNameInRow="DataOra" msprop:Generator_ColumnPropNameInTable="DataOraColumn" msprop:Generator_UserColumnName="DataOra" type="xs:dateTime" />
@@ -3662,7 +3664,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="RilievoTemp" msprop:Generator_TableClassName="RilievoTempDataTable" msprop:Generator_TableVarName="tableRilievoTemp" msprop:Generator_TablePropName="RilievoTemp" msprop:Generator_RowDeletingName="RilievoTempRowDeleting" msprop:Generator_RowChangingName="RilievoTempRowChanging" msprop:Generator_RowEvHandlerName="RilievoTempRowChangeEventHandler" msprop:Generator_RowDeletedName="RilievoTempRowDeleted" msprop:Generator_UserTableName="RilievoTemp" msprop:Generator_RowChangedName="RilievoTempRowChanged" msprop:Generator_RowEvArgName="RilievoTempRowChangeEvent" msprop:Generator_RowClassName="RilievoTempRow">
<xs:element name="RilievoTemp" msprop:Generator_TableClassName="RilievoTempDataTable" msprop:Generator_TableVarName="tableRilievoTemp" msprop:Generator_RowChangedName="RilievoTempRowChanged" msprop:Generator_TablePropName="RilievoTemp" msprop:Generator_RowDeletingName="RilievoTempRowDeleting" msprop:Generator_RowChangingName="RilievoTempRowChanging" msprop:Generator_RowEvHandlerName="RilievoTempRowChangeEventHandler" msprop:Generator_RowDeletedName="RilievoTempRowDeleted" msprop:Generator_RowClassName="RilievoTempRow" msprop:Generator_UserTableName="RilievoTemp" msprop:Generator_RowEvArgName="RilievoTempRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idxDipendente" msprop:Generator_ColumnVarNameInTable="columnidxDipendente" msprop:Generator_ColumnPropNameInRow="idxDipendente" msprop:Generator_ColumnPropNameInTable="idxDipendenteColumn" msprop:Generator_UserColumnName="idxDipendente" type="xs:int" />
@@ -3671,7 +3673,7 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="HistTemp" msprop:Generator_TableClassName="HistTempDataTable" msprop:Generator_TableVarName="tableHistTemp" msprop:Generator_TablePropName="HistTemp" msprop:Generator_RowDeletingName="HistTempRowDeleting" msprop:Generator_RowChangingName="HistTempRowChanging" msprop:Generator_RowEvHandlerName="HistTempRowChangeEventHandler" msprop:Generator_RowDeletedName="HistTempRowDeleted" msprop:Generator_UserTableName="HistTemp" msprop:Generator_RowChangedName="HistTempRowChanged" msprop:Generator_RowEvArgName="HistTempRowChangeEvent" msprop:Generator_RowClassName="HistTempRow">
<xs:element name="HistTemp" msprop:Generator_TableClassName="HistTempDataTable" msprop:Generator_TableVarName="tableHistTemp" msprop:Generator_RowChangedName="HistTempRowChanged" msprop:Generator_TablePropName="HistTemp" msprop:Generator_RowDeletingName="HistTempRowDeleting" msprop:Generator_RowChangingName="HistTempRowChanging" msprop:Generator_RowEvHandlerName="HistTempRowChangeEventHandler" msprop:Generator_RowDeletedName="HistTempRowDeleted" msprop:Generator_RowClassName="HistTempRow" msprop:Generator_UserTableName="HistTemp" msprop:Generator_RowEvArgName="HistTempRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="tempRil" msprop:Generator_ColumnVarNameInTable="columntempRil" msprop:Generator_ColumnPropNameInRow="tempRil" msprop:Generator_ColumnPropNameInTable="tempRilColumn" msprop:Generator_UserColumnName="tempRil" type="xs:decimal" />
@@ -3775,13 +3777,13 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt
</xs:element>
<xs:annotation>
<xs:appinfo>
<msdata:Relationship name="FK_Timbrature_Dipendenti" msdata:parent="Dipendenti" msdata:child="Timbrature" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="Timbrature" msprop:Generator_ChildPropName="GetTimbratureRows" msprop:Generator_UserRelationName="FK_Timbrature_Dipendenti" msprop:Generator_RelationVarName="relationFK_Timbrature_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" />
<msdata:Relationship name="FK_AnagProgetti_AnagClienti" msdata:parent="AnagClienti" msdata:child="AnagProgetti" msdata:parentkey="idxCliente" msdata:childkey="idxCliente" msprop:Generator_UserChildTable="AnagProgetti" msprop:Generator_ChildPropName="GetAnagProgettiRows" msprop:Generator_UserRelationName="FK_AnagProgetti_AnagClienti" msprop:Generator_RelationVarName="relationFK_AnagProgetti_AnagClienti" msprop:Generator_UserParentTable="AnagClienti" msprop:Generator_ParentPropName="AnagClientiRow" />
<msdata:Relationship name="FK_AnagFasi_AnagProgetti" msdata:parent="AnagProgetti" msdata:child="AnagFasi" msdata:parentkey="idxProgetto" msdata:childkey="idxProgetto" msprop:Generator_UserChildTable="AnagFasi" msprop:Generator_ChildPropName="GetAnagFasiRows" msprop:Generator_UserRelationName="FK_AnagFasi_AnagProgetti" msprop:Generator_RelationVarName="relationFK_AnagFasi_AnagProgetti" msprop:Generator_UserParentTable="AnagProgetti" msprop:Generator_ParentPropName="AnagProgettiRow" />
<msdata:Relationship name="FK_RegAttivita_AnagFasi" msdata:parent="AnagFasi" msdata:child="RegAttivita" msdata:parentkey="idxFase" msdata:childkey="idxFase" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_AnagFasi" msprop:Generator_RelationVarName="relationFK_RegAttivita_AnagFasi" msprop:Generator_UserParentTable="AnagFasi" msprop:Generator_ParentPropName="AnagFasiRow" />
<msdata:Relationship name="FK_RegAttivita_Dipendenti" msdata:parent="Dipendenti" msdata:child="RegAttivita" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_Dipendenti" msprop:Generator_RelationVarName="relationFK_RegAttivita_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" />
<msdata:Relationship name="FK_Dipendenti_AnagOrari" msdata:parent="AnagOrari" msdata:child="Dipendenti" msdata:parentkey="codOrario" msdata:childkey="codOrario" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagOrari" msprop:Generator_ParentPropName="AnagOrariRow" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagOrari" msprop:Generator_UserParentTable="AnagOrari" />
<msdata:Relationship name="FK_RilievoTemp_Dipendenti" msdata:parent="Dipendenti" msdata:child="RilievoTemp" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="RilievoTemp" msprop:Generator_ChildPropName="GetRilievoTempRows" msprop:Generator_UserRelationName="FK_RilievoTemp_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_RelationVarName="relationFK_RilievoTemp_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" />
<msdata:Relationship name="FK_Timbrature_Dipendenti" msdata:parent="Dipendenti" msdata:child="Timbrature" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="Timbrature" msprop:Generator_ChildPropName="GetTimbratureRows" msprop:Generator_UserRelationName="FK_Timbrature_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_RelationVarName="relationFK_Timbrature_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" />
<msdata:Relationship name="FK_AnagProgetti_AnagClienti" msdata:parent="AnagClienti" msdata:child="AnagProgetti" msdata:parentkey="idxCliente" msdata:childkey="idxCliente" msprop:Generator_UserChildTable="AnagProgetti" msprop:Generator_ChildPropName="GetAnagProgettiRows" msprop:Generator_UserRelationName="FK_AnagProgetti_AnagClienti" msprop:Generator_ParentPropName="AnagClientiRow" msprop:Generator_RelationVarName="relationFK_AnagProgetti_AnagClienti" msprop:Generator_UserParentTable="AnagClienti" />
<msdata:Relationship name="FK_AnagFasi_AnagProgetti" msdata:parent="AnagProgetti" msdata:child="AnagFasi" msdata:parentkey="idxProgetto" msdata:childkey="idxProgetto" msprop:Generator_UserChildTable="AnagFasi" msprop:Generator_ChildPropName="GetAnagFasiRows" msprop:Generator_UserRelationName="FK_AnagFasi_AnagProgetti" msprop:Generator_ParentPropName="AnagProgettiRow" msprop:Generator_RelationVarName="relationFK_AnagFasi_AnagProgetti" msprop:Generator_UserParentTable="AnagProgetti" />
<msdata:Relationship name="FK_RegAttivita_AnagFasi" msdata:parent="AnagFasi" msdata:child="RegAttivita" msdata:parentkey="idxFase" msdata:childkey="idxFase" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_AnagFasi" msprop:Generator_ParentPropName="AnagFasiRow" msprop:Generator_RelationVarName="relationFK_RegAttivita_AnagFasi" msprop:Generator_UserParentTable="AnagFasi" />
<msdata:Relationship name="FK_RegAttivita_Dipendenti" msdata:parent="Dipendenti" msdata:child="RegAttivita" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="RegAttivita" msprop:Generator_ChildPropName="GetRegAttivitaRows" msprop:Generator_UserRelationName="FK_RegAttivita_Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" msprop:Generator_RelationVarName="relationFK_RegAttivita_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" />
<msdata:Relationship name="FK_Dipendenti_AnagOrari" msdata:parent="AnagOrari" msdata:child="Dipendenti" msdata:parentkey="codOrario" msdata:childkey="codOrario" msprop:Generator_UserChildTable="Dipendenti" msprop:Generator_ChildPropName="GetDipendentiRows" msprop:Generator_UserRelationName="FK_Dipendenti_AnagOrari" msprop:Generator_RelationVarName="relationFK_Dipendenti_AnagOrari" msprop:Generator_UserParentTable="AnagOrari" msprop:Generator_ParentPropName="AnagOrariRow" />
<msdata:Relationship name="FK_RilievoTemp_Dipendenti" msdata:parent="Dipendenti" msdata:child="RilievoTemp" msdata:parentkey="idxDipendente" msdata:childkey="idxDipendente" msprop:Generator_UserChildTable="RilievoTemp" msprop:Generator_ChildPropName="GetRilievoTempRows" msprop:Generator_UserRelationName="FK_RilievoTemp_Dipendenti" msprop:Generator_RelationVarName="relationFK_RilievoTemp_Dipendenti" msprop:Generator_UserParentTable="Dipendenti" msprop:Generator_ParentPropName="DipendentiRow" />
</xs:appinfo>
</xs:annotation>
</xs:schema>
GPW_Data/DS_Applicazione.xss
+8 -8
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="438" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-35" ViewPortY="54" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Timbrature" ZOrder="27" X="279" Y="76" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:TimbratureExpl" ZOrder="5" X="622" Y="64" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -21,12 +21,12 @@
<Shape ID="DesignTable:TimbMeseExpl" ZOrder="20" X="1249" Y="134" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Giustificativi" ZOrder="7" X="885" Y="1385" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:stp_DipendentiAndAnomalie" ZOrder="19" X="82" Y="1313" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:TE_RA_Expl" ZOrder="12" X="-3" Y="176" Height="365" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:TE_RA_Expl" ZOrder="12" X="-3" Y="176" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:regAttDayExpl" ZOrder="16" X="19" Y="886" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagProgetti_Expl" ZOrder="14" X="1236" Y="992" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:RegistroEventi" ZOrder="11" X="85" Y="1476" Height="153" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:RilievoTemp" ZOrder="4" X="528" Y="1434" Height="191" Width="248" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:HistTemp" ZOrder="1" X="321" Y="1507" Height="115" Width="197" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:RilievoTemp" ZOrder="4" X="-29" Y="522" Height="191" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:HistTemp" ZOrder="1" X="-26" Y="727" Height="115" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_Timbrature_Dipendenti" ZOrder="28" LineWidth="11">
@@ -124,12 +124,12 @@
<Connector ID="DesignRelation:FK_RilievoTemp_Dipendenti" ZOrder="3" LineWidth="11">
<RoutePoints>
<Point>
<X>553</X>
<Y>859</Y>
<X>279</X>
<Y>617</Y>
</Point>
<Point>
<X>553</X>
<Y>1434</Y>
<X>204</X>
<Y>617</Y>
</Point>
</RoutePoints>
</Connector>
GPW_Data/Objects.cs
+6 -1
View File
@@ -6,9 +6,14 @@ using System.Threading.Tasks;
namespace GPW_data
{
public class chartJsTSerie
public class chartJsTSerie
{
public DateTime x { get; set; }
public decimal y { get; set; }
}
public class chartJsXY
{
public decimal x { get; set; }
public decimal y { get; set; }
}
}
GPW_Smart/Controllers/TempHistController.cs
+34 -15
View File
@@ -1,4 +1,5 @@
using System;
using GPW_data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
@@ -9,31 +10,49 @@ namespace GPW_Smart.Controllers
{
public class TempHistController : ApiController
{
// GET api/<controller>
public IEnumerable<string> Get()
/// <summary>
/// Metodo effettivo recupero dati
/// </summary>
/// <param name="id"></param>
/// <param name="numRec"></param>
/// <param name="dtRif"></param>
/// <returns></returns>
private static List<chartJsXY> getDataFilt(int id, int numRec, DateTime dtRif)
{
return new string[] { "value1", "value2" };
List<chartJsXY> answ = new List<chartJsXY>();
var tabDati = DataProxy.DP.taHT.GetData(id, dtRif, numRec);
// ciclo
foreach (var item in tabDati)
{
answ.Add(new chartJsXY() { x = item.tempRil, y = item.freq });
}
// restituisco
return answ;
}
// GET api/<controller>/5
public string Get(int id)
// GET api/TempHist
public string Get()
{
return "value";
return "NA";
}
// POST api/<controller>
public void Post([FromBody] string value)
// GET api/TempHist/5
public List<chartJsXY> Get(int id)
{
int numRec = 0;
DateTime dtRif = DateTime.Today;
// restituisco oggetto!
return getDataFilt(id, numRec, dtRif);
}
// PUT api/<controller>/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/<controller>/5
public void Delete(int id)
// GET api/TempHist/5?date=2020-09-01&numRec=10
public List<chartJsXY> Get(int id, string date, int numRec)
{
DateTime dtRif = DateTime.Today;
DateTime.TryParse(date, out dtRif);
// restituisco oggetto!
return getDataFilt(id, numRec, dtRif);
}
}
}
GPW_Smart/Controllers/TempRilController.cs
+23 -39
View File
@@ -10,6 +10,25 @@ namespace GPW_Smart.Controllers
{
public class TempRilController : ApiController
{
/// <summary>
/// Metodo effettivo recupero dati
/// </summary>
/// <param name="id"></param>
/// <param name="numRec"></param>
/// <param name="dtRif"></param>
/// <returns></returns>
private static List<chartJsTSerie> getDataFilt(int id, int numRec, DateTime dtRif)
{
List<chartJsTSerie> answ = new List<chartJsTSerie>();
var tabDati = DataProxy.DP.taRT.getByUserPeriod(id, dtRif, numRec);
// ciclo
foreach (var item in tabDati)
{
answ.Add(new chartJsTSerie() { x = item.dtRilievo, y = item.tempRil });
}
// restituisco
return answ;
}
// GET api/TempRil
public string Get()
{
@@ -19,54 +38,19 @@ namespace GPW_Smart.Controllers
// GET api/TempRil/5
public List<chartJsTSerie> Get(int id)
{
List<chartJsTSerie> answ = new List<chartJsTSerie>();
// recupero dati
var tabDati = DataProxy.DP.taRT.getByUserPeriod(id, DateTime.Today, 0);
foreach (var item in tabDati)
{
answ.Add(new chartJsTSerie() { x = item.dtRilievo, y = item.tempRil });
}
int numRec = 0;
DateTime dtRif = DateTime.Today;
// restituisco oggetto!
return answ;
return getDataFilt(id, numRec, dtRif);
}
// GET api/TempRil/5?date=2020-09-01&numRec=10
public List<chartJsTSerie> Get(int id, string date, int numRec)
{
DateTime dtRif = DateTime.Today;
DateTime.TryParse(date, out dtRif);
List<chartJsTSerie> answ = new List<chartJsTSerie>();
// recupero dati
var tabDati = DataProxy.DP.taRT.getByUserPeriod(id, dtRif, numRec);
foreach (var item in tabDati)
{
answ.Add(new chartJsTSerie() { x = item.dtRilievo, y = item.tempRil });
}
// restituisco oggetto!
return answ;
return getDataFilt(id, numRec, dtRif);
}
//// POST api/TempRil
//public void Post([FromBody] string value)
//{
//}
//// PUT api/TempRil/5
//public void Put(int id, [FromBody] string value)
//{
//}
//// DELETE api/TempRil/5
//public void Delete(int id)
//{
//}
}
}
GPW_Smart/TempRil.aspx
+6 -3
View File
@@ -4,10 +4,13 @@
<%@ Register Src="~/WebUserControls/cmp_chart.ascx" TagPrefix="uc1" TagName="cmp_chart" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<uc1:cmp_rilTemp runat="server" id="cmp_rilTemp" />
<uc1:cmp_rilTemp runat="server" ID="cmp_rilTemp" />
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="SecondContent" runat="server">
<uc1:cmp_chart runat="server" ID="cmp_chart" />
<div class="mb-5">
<uc1:cmp_chart runat="server" ID="cmp_chart" />
</div>
</asp:Content>
GPW_Smart/WebUserControls/cmp_chart.ascx
+84 -16
View File
@@ -1,9 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_chart.ascx.cs" Inherits="GPW_Smart.WebUserControls.cmp_chart" %>
<canvas id="myChart"></canvas>
<%--https://www.chartjs.org/--%>
<asp:HiddenField runat="server" ID="hfIdxDip" />
<asp:HiddenField runat="server" ID="hfData" />
<canvas id="myChartTS" width="300" height="120"></canvas>
<div class="row">
<div class="col-6 text-right">Periodo</div>
<div class="col-6">
@@ -17,6 +18,8 @@
</asp:DropDownList>
</div>
</div>
<canvas id="myChartHist" width="300" height="120"></canvas>
<script>
// funzione eseguita se successo al caricamento
@@ -24,36 +27,36 @@
// recupero dati restituiti
var dataTS = reponse;
//console.log('Recieved our data', dataTS);
var myOptions = {
scales: {
yAxes: [{
//type: 'linear',
display: true,
ticks: {
maxTicksLimit: 10,
}
}],
xAxes: [{
type: 'time',
distribution: 'linear',
}]
}
//responsive: true,
//maintainAspectRatio: true,
, animation: {
duration: 200
duration: 100
},
//legend: {
// display: false
//}
};
//console.log('Recieved our data', dataTS);
// recupero obj chart
var ctx = document.getElementById('myChart').getContext('2d');
var ctx = document.getElementById('myChartTS').getContext('2d');
var chart = new Chart(ctx, {
type: 'line',
data: {
datasets: [{
//backgroundColor: 'rgb(180,180,180)',
borderColor: 'rgb(60, 180, 120)',
borderColor: 'rgb(7, 173, 236)',
lineTension: 0,
steppedLine: true,
label: 'Temperatura Rilevata',
data: dataTS
}]
@@ -66,7 +69,59 @@
function OnErrorCall_(repo) {
alert("Errore recupero dati grafico!");
}
// effettuo plotting grafico!
// funzione eseguita se successo al caricamento
function HistOnSuccess_(reponse) {
// recupero dati restituiti
var dataHist = reponse;
//console.log('Recieved our data', dataHist);
// opzioni
var myOptions = {
scales: {
yAxes: [{
//type: 'linear',
display: true,
ticks: {
beginAtZero: true,
maxTicksLimit: 10,
}
}]
},
animation: {
duration: 300
},
};
// converto i valori etichette/freq
var barVal = [], barLabels = [];
dataHist.forEach(function (entry) {
barVal.push(entry.y);
barLabels.push(entry.x);
});
//console.log('labels: ', barLabels);
//console.log('bars: ', barVal);
// recupero obj chart
var ctx = document.getElementById('myChartHist').getContext('2d');
var chart = new Chart(ctx, {
type: 'bar',
data: {
labels: barLabels,
datasets: [{
label: 'Freq. Osservate',
backgroundColor: 'rgb(7, 173, 236)',
data: barVal
}]
},
options: myOptions
});
}
// errore in reload!
function HistOnErrorCall_(repo) {
alert("Errore recupero dati grafico HIST!");
}
// effettuo plotting grafico TimeSerie!
function plotTS() {
// caricamento pagina
$.ajax({
@@ -78,10 +133,23 @@
error: OnErrorCall_
});
}
// effettuo plotting grafico Hist!
function plotHist() {
// caricamento pagina
$.ajax({
type: "GET",
url: "api/TempHist/<%=hfIdxDip.Value %>?date=<%=hfData.Value%>&numRec=<%=ddlMaxNum.SelectedValue%>",
contentType: "application/json; charset=utf-8",
dataType: "json",
success: HistOnSuccess_,
error: HistOnErrorCall_
});
}
// funzione di drawing ad OGNI pageload!
function pageLoad() {
// chiamo recupero dati + plot
// chiamo recupero dati + plot della TS e dell'Histogram
plotTS();
plotHist();
}
</script>
GPW_Smart/WebUserControls/cmp_params.ascx
+2
View File
@@ -44,6 +44,8 @@
<asp:ListItem Value="20"></asp:ListItem>
<asp:ListItem Value="25"></asp:ListItem>
<asp:ListItem Value="30"></asp:ListItem>
<asp:ListItem Value="60"></asp:ListItem>
<asp:ListItem Value="90"></asp:ListItem>
</asp:DropDownList>
</div>
<div>
Jenkinsfile
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=4119']) {
withEnv(['NEXT_BUILD_NUMBER=4120']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'GPW'