ver 1018: fix login tablet con SOLA pwd/authKey

This commit is contained in:
Samuele E. Locatelli
2018-12-04 23:46:45 +01:00
parent a6819c9533
commit 3b88a6b20f
6 changed files with 102 additions and 48 deletions
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1017']) {
withEnv(['NEXT_BUILD_NUMBER=1018']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+10 -3
View File
@@ -16,9 +16,16 @@
let scanner = new Instascan.Scanner({ video: document.getElementById('preview') });
scanner.addListener('scan', function (content) {
//console.log(content);
document.getElementById('<%= txtQRCode.ClientID %>').value = content;
document.getElementById('<%= hlReload.ClientID %>').href = content;
document.getElementById('<%= hlReload.ClientID %>').click();
var isUrl = content.includes("http");
if (isUrl) {
// se content è un URL --> faccio reload...
document.getElementById('<%= hlReload.ClientID %>').href = content;
document.getElementById('<%= hlReload.ClientID %>').click();
}
else {
// altrimenti salvo in textBox e processo
document.getElementById('<%= txtQRCode.ClientID %>').value = content;
}
});
Instascan.Camera.getCameras().then(function (cameras) {
if (cameras.length > 0) {
+19 -6
View File
@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using MapoDb;
using SteamWare;
using System;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonProTablet.WebUserControls
{
@@ -11,7 +9,7 @@ namespace MoonProTablet.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
// Richeisto https
// Richiesto https
// basato su instascan:
// https://github.com/schmich/instascan
if (!Page.IsPostBack)
@@ -23,6 +21,21 @@ namespace MoonProTablet.WebUserControls
protected void txtQRCode_TextChanged(object sender, EventArgs e)
{
// se abilitato login "pwdOnly" rimando a login...
if (memLayer.ML.cdvb("loginPwdOnly"))
{
string UserAuthKey = txtQRCode.Text.Trim();
// cerco se la pwd valida ci sia...
var results = DataLayer.obj.taOp.getByAuthKey(UserAuthKey);
if (results.Count > 0)
{
// in questo caso rimando a jumper...
int MatrOpr = results[0].MatrOpr;
// rimando a pagina login con pwdOnly...
Response.Redirect(string.Format("jumper?MatrOpr={0}&UserAuthKey={1}", MatrOpr, UserAuthKey));
}
}
//// rimando a pagina di login...
//Response.Redirect(txtQRCode.Text.Trim());
//hlReload.NavigateUrl=txtQRCode.Text.Trim();
+29 -6
View File
@@ -22329,24 +22329,30 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE (
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT * FROM dbo.AnagraficaOperatori";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "dbo.stp_AO_getByMatrAuthKey";
this._commandCollection[1].CommandText = "dbo.stp_AO_getByAuthKey";
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("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@authKey", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_AO_getByMatr";
this._commandCollection[2].CommandText = "dbo.stp_AO_getByMatrAuthKey";
this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@authKey", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
this._commandCollection[3].CommandText = "dbo.stp_AO_getByMatr";
this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", 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()]
@@ -22377,8 +22383,25 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE (
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_applicazione.AnagraficaOperatoriDataTable getByMatrAuthKey(global::System.Nullable<int> MatrOpr, string authKey) {
public virtual DS_applicazione.AnagraficaOperatoriDataTable getByAuthKey(string authKey) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((authKey == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(authKey));
}
DS_applicazione.AnagraficaOperatoriDataTable dataTable = new DS_applicazione.AnagraficaOperatoriDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_applicazione.AnagraficaOperatoriDataTable getByMatrAuthKey(global::System.Nullable<int> MatrOpr, string authKey) {
this.Adapter.SelectCommand = this.CommandCollection[2];
if ((MatrOpr.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(MatrOpr.Value));
}
@@ -22401,7 +22424,7 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE (
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_applicazione.AnagraficaOperatoriDataTable getByMatrOpr(global::System.Nullable<int> MatrOpr) {
this.Adapter.SelectCommand = this.CommandCollection[2];
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((MatrOpr.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(MatrOpr.Value));
}
+40 -29
View File
@@ -1678,6 +1678,17 @@ SELECT MatrOpr, Cognome, Nome, isAdmin, authKey FROM AnagraficaOperatori WHERE (
<Mapping SourceColumn="authKey" DataSetColumn="authKey" />
</Mappings>
<Sources>
<DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AO_getByAuthKey" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByAuthKey" GetMethodModifier="Public" GetMethodName="getByAuthKey" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByAuthKey" UserSourceName="getByAuthKey">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_AO_getByAuthKey</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="nvarchar" DbType="String" Direction="Input" ParameterName="@authKey" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AO_getByMatrAuthKey" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByMatrAuthKey" GetMethodModifier="Public" GetMethodName="getByMatrAuthKey" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByMatrAuthKey" UserSourceName="getByMatrAuthKey">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -3008,7 +3019,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="MicroStatoMacchina" msprop:Generator_TableClassName="MicroStatoMacchinaDataTable" msprop:Generator_TableVarName="tableMicroStatoMacchina" msprop:Generator_RowChangedName="MicroStatoMacchinaRowChanged" msprop:Generator_TablePropName="MicroStatoMacchina" msprop:Generator_RowDeletingName="MicroStatoMacchinaRowDeleting" msprop:Generator_RowChangingName="MicroStatoMacchinaRowChanging" msprop:Generator_RowEvHandlerName="MicroStatoMacchinaRowChangeEventHandler" msprop:Generator_RowDeletedName="MicroStatoMacchinaRowDeleted" msprop:Generator_RowClassName="MicroStatoMacchinaRow" msprop:Generator_UserTableName="MicroStatoMacchina" msprop:Generator_RowEvArgName="MicroStatoMacchinaRowChangeEvent">
<xs:element name="MicroStatoMacchina" msprop:Generator_TableClassName="MicroStatoMacchinaDataTable" msprop:Generator_TableVarName="tableMicroStatoMacchina" msprop:Generator_TablePropName="MicroStatoMacchina" msprop:Generator_RowDeletingName="MicroStatoMacchinaRowDeleting" msprop:Generator_RowChangingName="MicroStatoMacchinaRowChanging" msprop:Generator_RowEvHandlerName="MicroStatoMacchinaRowChangeEventHandler" msprop:Generator_RowDeletedName="MicroStatoMacchinaRowDeleted" msprop:Generator_UserTableName="MicroStatoMacchina" msprop:Generator_RowChangedName="MicroStatoMacchinaRowChanged" msprop:Generator_RowEvArgName="MicroStatoMacchinaRowChangeEvent" msprop:Generator_RowClassName="MicroStatoMacchinaRow">
<xs:complexType>
<xs:sequence>
<xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -3030,7 +3041,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="LinkMenuJQM" msprop:Generator_TableClassName="LinkMenuJQMDataTable" msprop:Generator_TableVarName="tableLinkMenuJQM" msprop:Generator_RowChangedName="LinkMenuJQMRowChanged" msprop:Generator_TablePropName="LinkMenuJQM" msprop:Generator_RowDeletingName="LinkMenuJQMRowDeleting" msprop:Generator_RowChangingName="LinkMenuJQMRowChanging" msprop:Generator_RowEvHandlerName="LinkMenuJQMRowChangeEventHandler" msprop:Generator_RowDeletedName="LinkMenuJQMRowDeleted" msprop:Generator_RowClassName="LinkMenuJQMRow" msprop:Generator_UserTableName="LinkMenuJQM" msprop:Generator_RowEvArgName="LinkMenuJQMRowChangeEvent">
<xs:element name="LinkMenuJQM" msprop:Generator_TableClassName="LinkMenuJQMDataTable" msprop:Generator_TableVarName="tableLinkMenuJQM" msprop:Generator_TablePropName="LinkMenuJQM" msprop:Generator_RowDeletingName="LinkMenuJQMRowDeleting" msprop:Generator_RowChangingName="LinkMenuJQMRowChanging" msprop:Generator_RowEvHandlerName="LinkMenuJQMRowChangeEventHandler" msprop:Generator_RowDeletedName="LinkMenuJQMRowDeleted" msprop:Generator_UserTableName="LinkMenuJQM" msprop:Generator_RowChangedName="LinkMenuJQMRowChanged" msprop:Generator_RowEvArgName="LinkMenuJQMRowChangeEvent" msprop:Generator_RowClassName="LinkMenuJQMRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxLink" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxLink" msprop:Generator_ColumnPropNameInRow="idxLink" msprop:Generator_ColumnPropNameInTable="idxLinkColumn" msprop:Generator_UserColumnName="idxLink" type="xs:int" />
@@ -3066,7 +3077,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="RemoteRebootLog" msprop:Generator_TableClassName="RemoteRebootLogDataTable" msprop:Generator_TableVarName="tableRemoteRebootLog" msprop:Generator_RowChangedName="RemoteRebootLogRowChanged" msprop:Generator_TablePropName="RemoteRebootLog" msprop:Generator_RowDeletingName="RemoteRebootLogRowDeleting" msprop:Generator_RowChangingName="RemoteRebootLogRowChanging" msprop:Generator_RowEvHandlerName="RemoteRebootLogRowChangeEventHandler" msprop:Generator_RowDeletedName="RemoteRebootLogRowDeleted" msprop:Generator_RowClassName="RemoteRebootLogRow" msprop:Generator_UserTableName="RemoteRebootLog" msprop:Generator_RowEvArgName="RemoteRebootLogRowChangeEvent">
<xs:element name="RemoteRebootLog" msprop:Generator_TableClassName="RemoteRebootLogDataTable" msprop:Generator_TableVarName="tableRemoteRebootLog" msprop:Generator_TablePropName="RemoteRebootLog" msprop:Generator_RowDeletingName="RemoteRebootLogRowDeleting" msprop:Generator_RowChangingName="RemoteRebootLogRowChanging" msprop:Generator_RowEvHandlerName="RemoteRebootLogRowChangeEventHandler" msprop:Generator_RowDeletedName="RemoteRebootLogRowDeleted" msprop:Generator_UserTableName="RemoteRebootLog" msprop:Generator_RowChangedName="RemoteRebootLogRowChanged" msprop:Generator_RowEvArgName="RemoteRebootLogRowChangeEvent" msprop:Generator_RowClassName="RemoteRebootLogRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxReboot" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxReboot" msprop:Generator_ColumnPropNameInRow="idxReboot" msprop:Generator_ColumnPropNameInTable="idxRebootColumn" msprop:Generator_UserColumnName="idxReboot" type="xs:int" />
@@ -3102,7 +3113,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ParetoDurate" msprop:Generator_TableClassName="ParetoDurateDataTable" msprop:Generator_TableVarName="tableParetoDurate" msprop:Generator_RowChangedName="ParetoDurateRowChanged" msprop:Generator_TablePropName="ParetoDurate" msprop:Generator_RowDeletingName="ParetoDurateRowDeleting" msprop:Generator_RowChangingName="ParetoDurateRowChanging" msprop:Generator_RowEvHandlerName="ParetoDurateRowChangeEventHandler" msprop:Generator_RowDeletedName="ParetoDurateRowDeleted" msprop:Generator_RowClassName="ParetoDurateRow" msprop:Generator_UserTableName="ParetoDurate" msprop:Generator_RowEvArgName="ParetoDurateRowChangeEvent">
<xs:element name="ParetoDurate" msprop:Generator_TableClassName="ParetoDurateDataTable" msprop:Generator_TableVarName="tableParetoDurate" msprop:Generator_TablePropName="ParetoDurate" msprop:Generator_RowDeletingName="ParetoDurateRowDeleting" msprop:Generator_RowChangingName="ParetoDurateRowChanging" msprop:Generator_RowEvHandlerName="ParetoDurateRowChangeEventHandler" msprop:Generator_RowDeletedName="ParetoDurateRowDeleted" msprop:Generator_UserTableName="ParetoDurate" msprop:Generator_RowChangedName="ParetoDurateRowChanged" msprop:Generator_RowEvArgName="ParetoDurateRowChangeEvent" msprop:Generator_RowClassName="ParetoDurateRow">
<xs:complexType>
<xs:sequence>
<xs:element name="IdxMacchina" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina" minOccurs="0">
@@ -3119,7 +3130,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="SignalLog" msprop:Generator_TableClassName="SignalLogDataTable" msprop:Generator_TableVarName="tableSignalLog" msprop:Generator_TablePropName="SignalLog" msprop:Generator_RowDeletingName="SignalLogRowDeleting" msprop:Generator_RowChangingName="SignalLogRowChanging" msprop:Generator_RowEvHandlerName="SignalLogRowChangeEventHandler" msprop:Generator_RowDeletedName="SignalLogRowDeleted" msprop:Generator_UserTableName="SignalLog" msprop:Generator_RowChangedName="SignalLogRowChanged" msprop:Generator_RowEvArgName="SignalLogRowChangeEvent" msprop:Generator_RowClassName="SignalLogRow">
<xs:element name="SignalLog" msprop:Generator_TableClassName="SignalLogDataTable" msprop:Generator_TableVarName="tableSignalLog" msprop:Generator_RowChangedName="SignalLogRowChanged" msprop:Generator_TablePropName="SignalLog" msprop:Generator_RowDeletingName="SignalLogRowDeleting" msprop:Generator_RowChangingName="SignalLogRowChanging" msprop:Generator_RowEvHandlerName="SignalLogRowChangeEventHandler" msprop:Generator_RowDeletedName="SignalLogRowDeleted" msprop:Generator_RowClassName="SignalLogRow" msprop:Generator_UserTableName="SignalLog" msprop:Generator_RowEvArgName="SignalLogRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="idxMsg" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxMsg" msprop:Generator_ColumnPropNameInRow="idxMsg" msprop:Generator_ColumnPropNameInTable="idxMsgColumn" msprop:Generator_UserColumnName="idxMsg" type="xs:int" />
@@ -3143,7 +3154,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagArticoli" msprop:Generator_TableClassName="AnagArticoliDataTable" msprop:Generator_TableVarName="tableAnagArticoli" msprop:Generator_RowChangedName="AnagArticoliRowChanged" msprop:Generator_TablePropName="AnagArticoli" msprop:Generator_RowDeletingName="AnagArticoliRowDeleting" msprop:Generator_RowChangingName="AnagArticoliRowChanging" msprop:Generator_RowEvHandlerName="AnagArticoliRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArticoliRowDeleted" msprop:Generator_RowClassName="AnagArticoliRow" msprop:Generator_UserTableName="AnagArticoli" msprop:Generator_RowEvArgName="AnagArticoliRowChangeEvent">
<xs:element name="AnagArticoli" msprop:Generator_TableClassName="AnagArticoliDataTable" msprop:Generator_TableVarName="tableAnagArticoli" msprop:Generator_TablePropName="AnagArticoli" msprop:Generator_RowDeletingName="AnagArticoliRowDeleting" msprop:Generator_RowChangingName="AnagArticoliRowChanging" msprop:Generator_RowEvHandlerName="AnagArticoliRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArticoliRowDeleted" msprop:Generator_UserTableName="AnagArticoli" msprop:Generator_RowChangedName="AnagArticoliRowChanged" msprop:Generator_RowEvArgName="AnagArticoliRowChangeEvent" msprop:Generator_RowClassName="AnagArticoliRow">
<xs:complexType>
<xs:sequence>
<xs:element name="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn" msprop:Generator_UserColumnName="CodArticolo">
@@ -3185,7 +3196,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="MSFD" msprop:Generator_TableClassName="MSFDDataTable" msprop:Generator_TableVarName="tableMSFD" msprop:Generator_RowChangedName="MSFDRowChanged" msprop:Generator_TablePropName="MSFD" msprop:Generator_RowDeletingName="MSFDRowDeleting" msprop:Generator_RowChangingName="MSFDRowChanging" msprop:Generator_RowEvHandlerName="MSFDRowChangeEventHandler" msprop:Generator_RowDeletedName="MSFDRowDeleted" msprop:Generator_RowClassName="MSFDRow" msprop:Generator_UserTableName="MSFD" msprop:Generator_RowEvArgName="MSFDRowChangeEvent">
<xs:element name="MSFD" msprop:Generator_TableClassName="MSFDDataTable" msprop:Generator_TableVarName="tableMSFD" msprop:Generator_TablePropName="MSFD" msprop:Generator_RowDeletingName="MSFDRowDeleting" msprop:Generator_RowChangingName="MSFDRowChanging" msprop:Generator_RowEvHandlerName="MSFDRowChangeEventHandler" msprop:Generator_RowDeletedName="MSFDRowDeleted" msprop:Generator_UserTableName="MSFD" msprop:Generator_RowChangedName="MSFDRowChanged" msprop:Generator_RowEvArgName="MSFDRowChangeEvent" msprop:Generator_RowClassName="MSFDRow">
<xs:complexType>
<xs:sequence>
<xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -3264,7 +3275,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="FluxLog" msprop:Generator_TableClassName="FluxLogDataTable" msprop:Generator_TableVarName="tableFluxLog" msprop:Generator_TablePropName="FluxLog" msprop:Generator_RowDeletingName="FluxLogRowDeleting" msprop:Generator_RowChangingName="FluxLogRowChanging" msprop:Generator_RowEvHandlerName="FluxLogRowChangeEventHandler" msprop:Generator_RowDeletedName="FluxLogRowDeleted" msprop:Generator_UserTableName="FluxLog" msprop:Generator_RowChangedName="FluxLogRowChanged" msprop:Generator_RowEvArgName="FluxLogRowChangeEvent" msprop:Generator_RowClassName="FluxLogRow">
<xs:element name="FluxLog" msprop:Generator_TableClassName="FluxLogDataTable" msprop:Generator_TableVarName="tableFluxLog" msprop:Generator_RowChangedName="FluxLogRowChanged" msprop:Generator_TablePropName="FluxLog" msprop:Generator_RowDeletingName="FluxLogRowDeleting" msprop:Generator_RowChangingName="FluxLogRowChanging" msprop:Generator_RowEvHandlerName="FluxLogRowChangeEventHandler" msprop:Generator_RowDeletedName="FluxLogRowDeleted" msprop:Generator_RowClassName="FluxLogRow" msprop:Generator_UserTableName="FluxLog" msprop:Generator_RowEvArgName="FluxLogRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -3293,7 +3304,7 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagraficaGruppi" msprop:Generator_TableClassName="AnagraficaGruppiDataTable" msprop:Generator_TableVarName="tableAnagraficaGruppi" msprop:Generator_RowChangedName="AnagraficaGruppiRowChanged" msprop:Generator_TablePropName="AnagraficaGruppi" msprop:Generator_RowDeletingName="AnagraficaGruppiRowDeleting" msprop:Generator_RowChangingName="AnagraficaGruppiRowChanging" msprop:Generator_RowEvHandlerName="AnagraficaGruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagraficaGruppiRowDeleted" msprop:Generator_RowClassName="AnagraficaGruppiRow" msprop:Generator_UserTableName="AnagraficaGruppi" msprop:Generator_RowEvArgName="AnagraficaGruppiRowChangeEvent">
<xs:element name="AnagraficaGruppi" msprop:Generator_TableClassName="AnagraficaGruppiDataTable" msprop:Generator_TableVarName="tableAnagraficaGruppi" msprop:Generator_TablePropName="AnagraficaGruppi" msprop:Generator_RowDeletingName="AnagraficaGruppiRowDeleting" msprop:Generator_RowChangingName="AnagraficaGruppiRowChanging" msprop:Generator_RowEvHandlerName="AnagraficaGruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagraficaGruppiRowDeleted" msprop:Generator_UserTableName="AnagraficaGruppi" msprop:Generator_RowChangedName="AnagraficaGruppiRowChanged" msprop:Generator_RowEvArgName="AnagraficaGruppiRowChangeEvent" msprop:Generator_RowClassName="AnagraficaGruppiRow">
<xs:complexType>
<xs:sequence>
<xs:element name="CodGruppo" msprop:Generator_ColumnVarNameInTable="columnCodGruppo" msprop:Generator_ColumnPropNameInRow="CodGruppo" msprop:Generator_ColumnPropNameInTable="CodGruppoColumn" msprop:Generator_UserColumnName="CodGruppo">
@@ -3444,26 +3455,26 @@ SELECT CodGruppo, TipoGruppo, DescrGruppo FROM AnagraficaGruppi WHERE (CodGruppo
</xs:element>
<xs:annotation>
<xs:appinfo>
<msdata:Relationship name="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" />
<msdata:Relationship name="FK_Macchine2FamiglieMacchine_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" />
<msdata:Relationship name="FK_TransizioneStati_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="TransizioneStati" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" msprop:Generator_RelationVarName="relationFK_TransizioneStati_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" />
<msdata:Relationship name="FK_StatoMacchine_Macchine" msdata:parent="Macchine" msdata:child="StatoMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_StatoMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" />
<msdata:Relationship name="FK_TransizioneStati_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="TransizioneStati" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" />
<msdata:Relationship name="FK_StatoMacchine_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="StatoMacchine" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" />
<msdata:Relationship name="FK_EventList_Macchine" msdata:parent="Macchine" msdata:child="EventList" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_EventList_Macchine" msprop:Generator_UserParentTable="Macchine" />
<msdata:Relationship name="FK_TransizioneStati_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneStati" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" />
<msdata:Relationship name="FK_EventList_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="EventList" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" />
<msdata:Relationship name="FK_DiarioDiBordo_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="DiarioDiBordo" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" />
<msdata:Relationship name="FK_DiarioDiBordo_Macchine" msdata:parent="Macchine" msdata:child="DiarioDiBordo" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_Macchine" msprop:Generator_UserParentTable="Macchine" />
<msdata:Relationship name="FK_TransizioneEventi_AnagraficaEventi1" msdata:parent="AnagraficaEventi" msdata:child="TransizioneEventi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneEventi" msprop:Generator_ChildPropName="GetTransizioneEventiRows" msprop:Generator_UserRelationName="FK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_UserParentTable="AnagraficaEventi" />
<msdata:Relationship name="FK_Macchine2FamigliaIngressi_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_UserParentTable="Macchine" />
<msdata:Relationship name="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" />
<msdata:Relationship name="FK_TransizioneIngressi_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" />
<msdata:Relationship name="FK_TransizioneIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" />
<msdata:Relationship name="FK_DiarioDiBordo_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="DiarioDiBordo" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" />
<msdata:Relationship name="FK_EventList_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="EventList" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" />
<msdata:Relationship name="FK_StatoMacchine_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="StatoMacchine" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" />
<msdata:Relationship name="AnagArticoli_DiarioDiBordo" msdata:parent="AnagArticoli" msdata:child="DiarioDiBordo" msdata:parentkey="CodArticolo" msdata:childkey="CodArticolo" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="AnagArticoli_DiarioDiBordo" msprop:Generator_ParentPropName="AnagArticoliRow" msprop:Generator_RelationVarName="relationAnagArticoli_DiarioDiBordo" msprop:Generator_UserParentTable="AnagArticoli" />
<msdata:Relationship name="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" />
<msdata:Relationship name="FK_Macchine2FamiglieMacchine_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
<msdata:Relationship name="FK_TransizioneStati_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="TransizioneStati" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_TransizioneStati_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" />
<msdata:Relationship name="FK_StatoMacchine_Macchine" msdata:parent="Macchine" msdata:child="StatoMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_Macchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
<msdata:Relationship name="FK_TransizioneStati_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="TransizioneStati" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
<msdata:Relationship name="FK_StatoMacchine_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="StatoMacchine" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaStati" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
<msdata:Relationship name="FK_EventList_Macchine" msdata:parent="Macchine" msdata:child="EventList" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_Macchine" msprop:Generator_RelationVarName="relationFK_EventList_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
<msdata:Relationship name="FK_TransizioneStati_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneStati" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaEventi" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
<msdata:Relationship name="FK_EventList_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="EventList" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaEventi" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
<msdata:Relationship name="FK_DiarioDiBordo_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="DiarioDiBordo" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaStati" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
<msdata:Relationship name="FK_DiarioDiBordo_Macchine" msdata:parent="Macchine" msdata:child="DiarioDiBordo" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_Macchine" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
<msdata:Relationship name="FK_TransizioneEventi_AnagraficaEventi1" msdata:parent="AnagraficaEventi" msdata:child="TransizioneEventi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneEventi" msprop:Generator_ChildPropName="GetTransizioneEventiRows" msprop:Generator_UserRelationName="FK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_RelationVarName="relationFK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
<msdata:Relationship name="FK_Macchine2FamigliaIngressi_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
<msdata:Relationship name="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" />
<msdata:Relationship name="FK_TransizioneIngressi_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
<msdata:Relationship name="FK_TransizioneIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" />
<msdata:Relationship name="FK_DiarioDiBordo_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="DiarioDiBordo" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
<msdata:Relationship name="FK_EventList_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="EventList" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaOperatori" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
<msdata:Relationship name="FK_StatoMacchine_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="StatoMacchine" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaOperatori" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
<msdata:Relationship name="AnagArticoli_DiarioDiBordo" msdata:parent="AnagArticoli" msdata:child="DiarioDiBordo" msdata:parentkey="CodArticolo" msdata:childkey="CodArticolo" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="AnagArticoli_DiarioDiBordo" msprop:Generator_RelationVarName="relationAnagArticoli_DiarioDiBordo" msprop:Generator_UserParentTable="AnagArticoli" msprop:Generator_ParentPropName="AnagArticoliRow" />
</xs:appinfo>
</xs:annotation>
</xs:schema>
+3 -3
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="55" 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="34" ViewPortY="322" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="22" X="553" Y="715" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:FamiglieMacchine" ZOrder="24" X="519" Y="1007" Height="135" Width="296" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
@@ -20,7 +20,7 @@
<Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="14" X="596" Y="1155" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="36" X="943" Y="1212" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
<Shape ID="DesignTable:TransizioneIngressi" ZOrder="3" X="578" Y="1608" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:AnagraficaOperatori" ZOrder="25" X="965" Y="641" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:AnagraficaOperatori" ZOrder="25" X="965" Y="641" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="11" X="1339" Y="1371" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
<Shape ID="DesignTable:DatiMacchine" ZOrder="13" X="1299" Y="634" Height="342" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
<Shape ID="DesignTable:MicroStatoMacchina" ZOrder="4" X="5" Y="1161" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
@@ -298,7 +298,7 @@
<RoutePoints>
<Point>
<X>982</X>
<Y>891</Y>
<Y>914</Y>
</Point>
<Point>
<X>982</X>