Aggiunta gestione add e reset etichette...

This commit is contained in:
Samuele Locatelli
2016-02-19 15:28:12 +01:00
parent 3a1bb737a1
commit 46d2317201
29 changed files with 11306 additions and 2701 deletions
+3
View File
@@ -24,6 +24,7 @@ namespace ETS_Data
public Ds_ProjEtsTableAdapters.Dip2ATRTableAdapter taD2ATR;
public Ds_ProjEtsTableAdapters.DipendentiTableAdapter taDip;
public Ds_ProjEtsTableAdapters.ImpiegoRisorseTableAdapter taIR;
public Ds_ProjEtsTableAdapters.LabelsCommTableAdapter taL2C;
public Ds_ProjEtsTableAdapters.ReleasedWeekTableAdapter taReW;
/* DS_utilsProjEts */
public DS_utilsProjEtsTableAdapters.v_selClientiTableAdapter taSelCli;
@@ -48,6 +49,7 @@ namespace ETS_Data
taD2ATR = new Ds_ProjEtsTableAdapters.Dip2ATRTableAdapter();
taDip = new Ds_ProjEtsTableAdapters.DipendentiTableAdapter();
taIR = new Ds_ProjEtsTableAdapters.ImpiegoRisorseTableAdapter();
taL2C = new Ds_ProjEtsTableAdapters.LabelsCommTableAdapter();
taReW = new Ds_ProjEtsTableAdapters.ReleasedWeekTableAdapter();
taSelCli = new DS_utilsProjEtsTableAdapters.v_selClientiTableAdapter();
taSelPro = new DS_utilsProjEtsTableAdapters.v_selProgettiTableAdapter();
@@ -72,6 +74,7 @@ namespace ETS_Data
taD2ATR.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taDip.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taIR.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taL2C.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taReW.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taSelCli.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taSelPro.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
File diff suppressed because it is too large Load Diff
+155 -1
View File
@@ -1505,6 +1505,116 @@ SELECT Anno, Sett, UsernameAD, dataConf FROM ReleasedWeek WHERE (Anno = @Anno) A
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="AnagLabelsTableAdapter" GeneratorDataComponentClassName="AnagLabelsTableAdapter" Name="AnagLabels" UserDataComponentName="AnagLabelsTableAdapter">
<MainSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.AnagLabels" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" 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">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [dbo].[AnagLabels] WHERE (([CodLabel] = @Original_CodLabel) AND ((@IsNull_DescrLabel = 1 AND [DescrLabel] IS NULL) OR ([DescrLabel] = @Original_DescrLabel)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DescrLabel" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DescrLabel" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DescrLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrLabel" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [dbo].[AnagLabels] ([CodLabel], [DescrLabel]) VALUES (@CodLabel, @DescrLabel);
SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DescrLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrLabel" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT CodLabel, DescrLabel FROM dbo.AnagLabels</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [dbo].[AnagLabels] SET [CodLabel] = @CodLabel, [DescrLabel] = @DescrLabel WHERE (([CodLabel] = @Original_CodLabel) AND ((@IsNull_DescrLabel = 1 AND [DescrLabel] IS NULL) OR ([DescrLabel] = @Original_DescrLabel)));
SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DescrLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrLabel" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_DescrLabel" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DescrLabel" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DescrLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DescrLabel" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="CodLabel" DataSetColumn="CodLabel" />
<Mapping SourceColumn="DescrLabel" DataSetColumn="DescrLabel" />
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="LabelsCommTableAdapter" GeneratorDataComponentClassName="LabelsCommTableAdapter" Name="LabelsComm" UserDataComponentName="LabelsCommTableAdapter">
<MainSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.LabelsComm" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" 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">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [dbo].[LabelsComm] WHERE (([idxFase] = @Original_idxFase) AND ([CodLabel] = @Original_CodLabel))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idxFase" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idxFase" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [dbo].[LabelsComm] ([idxFase], [CodLabel]) VALUES (@idxFase, @CodLabel);
SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFase = @idxFase)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@idxFase" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idxFase" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idxFase, CodLabel FROM dbo.LabelsComm</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [dbo].[LabelsComm] SET [idxFase] = @idxFase, [CodLabel] = @CodLabel WHERE (([idxFase] = @Original_idxFase) AND ([CodLabel] = @Original_CodLabel));
SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFase = @idxFase)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@idxFase" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idxFase" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idxFase" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idxFase" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodLabel" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodLabel" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="idxFase" DataSetColumn="idxFase" />
<Mapping SourceColumn="CodLabel" DataSetColumn="CodLabel" />
</Mappings>
<Sources>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="deleteByFase" Modifier="Public" Name="deleteByFase" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="deleteByFase">
<DeleteCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_L2C_deleteByFase</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="@Original_idxFase" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</DeleteCommand>
</DbSource>
</Sources>
</TableAdapter>
</Tables>
<Sources />
</DataSource>
@@ -1901,7 +2011,7 @@ SELECT Anno, Sett, UsernameAD, dataConf FROM ReleasedWeek WHERE (Anno = @Anno) A
<xs:element name="Labels" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnLabels" msprop:Generator_ColumnPropNameInRow="Labels" msprop:Generator_ColumnPropNameInTable="LabelsColumn" msprop:Generator_UserColumnName="Labels" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="1" />
<xs:maxLength value="500" />
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -2225,6 +2335,40 @@ SELECT Anno, Sett, UsernameAD, dataConf FROM ReleasedWeek WHERE (Anno = @Anno) A
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AnagLabels" msprop:Generator_TableClassName="AnagLabelsDataTable" msprop:Generator_TableVarName="tableAnagLabels" msprop:Generator_TablePropName="AnagLabels" msprop:Generator_RowDeletingName="AnagLabelsRowDeleting" msprop:Generator_RowChangingName="AnagLabelsRowChanging" msprop:Generator_RowEvHandlerName="AnagLabelsRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagLabelsRowDeleted" msprop:Generator_UserTableName="AnagLabels" msprop:Generator_RowChangedName="AnagLabelsRowChanged" msprop:Generator_RowEvArgName="AnagLabelsRowChangeEvent" msprop:Generator_RowClassName="AnagLabelsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="CodLabel" msprop:Generator_ColumnVarNameInTable="columnCodLabel" msprop:Generator_ColumnPropNameInRow="CodLabel" msprop:Generator_ColumnPropNameInTable="CodLabelColumn" msprop:Generator_UserColumnName="CodLabel">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="DescrLabel" msprop:Generator_ColumnVarNameInTable="columnDescrLabel" msprop:Generator_ColumnPropNameInRow="DescrLabel" msprop:Generator_ColumnPropNameInTable="DescrLabelColumn" msprop:Generator_UserColumnName="DescrLabel" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="LabelsComm" msprop:Generator_TableClassName="LabelsCommDataTable" msprop:Generator_TableVarName="tableLabelsComm" msprop:Generator_TablePropName="LabelsComm" msprop:Generator_RowDeletingName="LabelsCommRowDeleting" msprop:Generator_RowChangingName="LabelsCommRowChanging" msprop:Generator_RowEvHandlerName="LabelsCommRowChangeEventHandler" msprop:Generator_RowDeletedName="LabelsCommRowDeleted" msprop:Generator_UserTableName="LabelsComm" msprop:Generator_RowChangedName="LabelsCommRowChanged" msprop:Generator_RowEvArgName="LabelsCommRowChangeEvent" msprop:Generator_RowClassName="LabelsCommRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idxFase" msprop:Generator_ColumnVarNameInTable="columnidxFase" msprop:Generator_ColumnPropNameInRow="idxFase" msprop:Generator_ColumnPropNameInTable="idxFaseColumn" msprop:Generator_UserColumnName="idxFase" type="xs:int" />
<xs:element name="CodLabel" msprop:Generator_ColumnVarNameInTable="columnCodLabel" msprop:Generator_ColumnPropNameInRow="CodLabel" msprop:Generator_ColumnPropNameInTable="CodLabelColumn" msprop:Generator_UserColumnName="CodLabel">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -2296,6 +2440,15 @@ SELECT Anno, Sett, UsernameAD, dataConf FROM ReleasedWeek WHERE (Anno = @Anno) A
<xs:selector xpath=".//mstns:ResocontoComm" />
<xs:field xpath="mstns:idxFase" />
</xs:unique>
<xs:unique name="AnagLabels_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:AnagLabels" />
<xs:field xpath="mstns:CodLabel" />
</xs:unique>
<xs:unique name="LabelsComm_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:LabelsComm" />
<xs:field xpath="mstns:idxFase" />
<xs:field xpath="mstns:CodLabel" />
</xs:unique>
</xs:element>
<xs:annotation>
<xs:appinfo>
@@ -2305,6 +2458,7 @@ SELECT Anno, Sett, UsernameAD, dataConf FROM ReleasedWeek WHERE (Anno = @Anno) A
<msdata:Relationship name="DatiCommessa_DatiCommInteg" msdata:parent="DatiCommessa" msdata:child="DatiCommInteg" msdata:parentkey="idxFase" msdata:childkey="idxFase" msprop:Generator_UserChildTable="DatiCommInteg" msprop:Generator_ChildPropName="GetDatiCommIntegRows" msprop:Generator_UserRelationName="DatiCommessa_DatiCommInteg" msprop:Generator_ParentPropName="DatiCommessaRow" msprop:Generator_RelationVarName="relationDatiCommessa_DatiCommInteg" msprop:Generator_UserParentTable="DatiCommessa" />
<msdata:Relationship name="AnagFasi_BdgtRisorseFasi" msdata:parent="AnagFasi" msdata:child="BdgtRisorseFasi" msdata:parentkey="idxFase" msdata:childkey="idxFase" msprop:Generator_UserChildTable="BdgtRisorseFasi" msprop:Generator_ChildPropName="GetBdgtRisorseFasiRows" msprop:Generator_UserRelationName="AnagFasi_BdgtRisorseFasi" msprop:Generator_ParentPropName="AnagFasiRow" msprop:Generator_RelationVarName="relationAnagFasi_BdgtRisorseFasi" msprop:Generator_UserParentTable="AnagFasi" />
<msdata:Relationship name="FK_BdgtRisorseFasi_AnagTipoRisorse" msdata:parent="AnagTipoRisorse" msdata:child="BdgtRisorseFasi" msdata:parentkey="CodTipoRisorsa" msdata:childkey="CodTipoRisorsa" msprop:Generator_UserChildTable="BdgtRisorseFasi" msprop:Generator_ChildPropName="GetBdgtRisorseFasiRows" msprop:Generator_UserRelationName="FK_BdgtRisorseFasi_AnagTipoRisorse" msprop:Generator_RelationVarName="relationFK_BdgtRisorseFasi_AnagTipoRisorse" msprop:Generator_UserParentTable="AnagTipoRisorse" msprop:Generator_ParentPropName="AnagTipoRisorseRow" />
<msdata:Relationship name="FK_LabelsComm_AnagLabels" msdata:parent="AnagLabels" msdata:child="LabelsComm" msdata:parentkey="CodLabel" msdata:childkey="CodLabel" msprop:Generator_UserChildTable="LabelsComm" msprop:Generator_ChildPropName="GetLabelsCommRows" msprop:Generator_UserRelationName="FK_LabelsComm_AnagLabels" msprop:Generator_ParentPropName="AnagLabelsRow" msprop:Generator_RelationVarName="relationFK_LabelsComm_AnagLabels" msprop:Generator_UserParentTable="AnagLabels" />
</xs:appinfo>
</xs:annotation>
</xs:schema>
+36 -22
View File
@@ -4,26 +4,28 @@
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="365" 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="73" ViewPortY="365" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:AnagProgetti" ZOrder="21" X="70" Y="36" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:AnagFasi" ZOrder="16" X="495" Y="56" Height="533" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:DatiCommessa" ZOrder="15" X="876" Y="56" Height="552" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="482" />
<Shape ID="DesignTable:DatiCommForn" ZOrder="3" X="1185" Y="69" Height="248" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:DatiCommInteg" ZOrder="17" X="1189" Y="378" Height="267" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:AnagCommFasi" ZOrder="5" X="532" Y="600" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ElencoFasiExpl" ZOrder="12" X="851" Y="651" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BdgtRisorseFasi" ZOrder="2" X="235" Y="679" Height="248" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagTipoRisorse" ZOrder="11" X="69" Y="501" Height="153" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dip2ATR" ZOrder="9" X="72" Y="939" Height="153" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dipendenti" ZOrder="8" X="615" Y="1011" Height="305" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BazaarRisorse" ZOrder="7" X="1175" Y="889" Height="347" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ImpiegoRisorse" ZOrder="6" X="858" Y="1051" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="138" />
<Shape ID="DesignTable:ReleasedWeek" ZOrder="4" X="26" Y="1124" Height="172" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:ResocontoComm" ZOrder="1" X="298" Y="1027" Height="305" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagProgetti" ZOrder="24" X="70" Y="36" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:AnagFasi" ZOrder="19" X="495" Y="56" Height="533" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:DatiCommessa" ZOrder="18" X="876" Y="56" Height="552" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="482" />
<Shape ID="DesignTable:DatiCommForn" ZOrder="7" X="1185" Y="69" Height="248" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:DatiCommInteg" ZOrder="20" X="1189" Y="378" Height="267" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:AnagCommFasi" ZOrder="9" X="532" Y="600" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ElencoFasiExpl" ZOrder="15" X="851" Y="651" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BdgtRisorseFasi" ZOrder="6" X="235" Y="679" Height="248" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagTipoRisorse" ZOrder="14" X="69" Y="501" Height="153" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dip2ATR" ZOrder="12" X="72" Y="939" Height="153" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dipendenti" ZOrder="11" X="615" Y="1011" Height="305" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BazaarRisorse" ZOrder="2" X="1170" Y="981" Height="347" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ImpiegoRisorse" ZOrder="10" X="858" Y="1051" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="138" />
<Shape ID="DesignTable:ReleasedWeek" ZOrder="8" X="26" Y="1124" Height="172" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:ResocontoComm" ZOrder="5" X="298" Y="1027" Height="305" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagLabels" ZOrder="4" X="1176" Y="658" Height="115" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:LabelsComm" ZOrder="1" X="1179" Y="824" Height="134" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:AnagProgetti_AnagFasi" ZOrder="20" LineWidth="11">
<Connector ID="DesignRelation:AnagProgetti_AnagFasi" ZOrder="23" LineWidth="11">
<RoutePoints>
<Point>
<X>370</X>
@@ -35,7 +37,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:DatiCommessa_AnagFasi" ZOrder="19" LineWidth="11">
<Connector ID="DesignRelation:DatiCommessa_AnagFasi" ZOrder="22" LineWidth="11">
<RoutePoints>
<Point>
<X>876</X>
@@ -47,7 +49,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:DatiCommessa_DatiCommForn" ZOrder="18" LineWidth="11">
<Connector ID="DesignRelation:DatiCommessa_DatiCommForn" ZOrder="21" LineWidth="11">
<RoutePoints>
<Point>
<X>1107</X>
@@ -59,7 +61,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:DatiCommessa_DatiCommInteg" ZOrder="10" LineWidth="11">
<Connector ID="DesignRelation:DatiCommessa_DatiCommInteg" ZOrder="13" LineWidth="11">
<RoutePoints>
<Point>
<X>1107</X>
@@ -79,7 +81,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:AnagFasi_BdgtRisorseFasi" ZOrder="14" LineWidth="11">
<Connector ID="DesignRelation:AnagFasi_BdgtRisorseFasi" ZOrder="17" LineWidth="11">
<RoutePoints>
<Point>
<X>495</X>
@@ -95,7 +97,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_BdgtRisorseFasi_AnagTipoRisorse" ZOrder="13" LineWidth="11">
<Connector ID="DesignRelation:FK_BdgtRisorseFasi_AnagTipoRisorse" ZOrder="16" LineWidth="11">
<RoutePoints>
<Point>
<X>172</X>
@@ -111,5 +113,17 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_LabelsComm_AnagLabels" ZOrder="3" LineWidth="11">
<RoutePoints>
<Point>
<X>1258</X>
<Y>773</Y>
</Point>
<Point>
<X>1258</X>
<Y>824</Y>
</Point>
</RoutePoints>
</Connector>
</Connectors>
</DiagramLayout>
+5 -5
View File
@@ -76,9 +76,9 @@
<Private>True</Private>
<HintPath>..\ETS-WS\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=2.0.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\PROJ-ETS\packages\NLog.2.0.1.2\lib\net40\NLog.dll</HintPath>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\PROJ-ETS\packages\NLog.4.2.3\lib\net40\NLog.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -107,7 +107,7 @@
<Compile Include="Ds_ProjEts.cs">
<DependentUpon>Ds_ProjEts.xsd</DependentUpon>
</Compile>
<Compile Include="Ds_ProjEts1.Designer.cs">
<Compile Include="Ds_ProjEts.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Ds_ProjEts.xsd</DependentUpon>
@@ -213,7 +213,7 @@
<None Include="Ds_ProjEts.xsd">
<SubType>Designer</SubType>
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>Ds_ProjEts1.Designer.cs</LastGenOutput>
<LastGenOutput>Ds_ProjEts.Designer.cs</LastGenOutput>
</None>
<None Include="Ds_ProjEts.xss">
<DependentUpon>Ds_ProjEts.xsd</DependentUpon>
+31 -16
View File
@@ -1,27 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
<!--
See http://nlog-project.org/wiki/Configuration_file
<!-- optional, add some variabeles
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>
<!-- file target -->
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${message}" archiveEvery="Day" />
<targets>
<!--viewer interattivo sentinel... http://sentinel.codeplex.com/-->
<target xsi:type="NLogViewer" name="sentinel" address="udp://127.0.0.1:9999"/>
<!--
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Writing events to the a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
</targets>
</targets>
<rules>
<!-- logging rules -->
<logger name="*" minlevel="Trace" writeTo="f" />
<!--<logger name="*" minlevel="Trace" writeTo="sentinel" />-->
</rules>
<rules>
<!-- add your logging rules here -->
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
</rules>
</nlog>
+770 -814
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.
+4 -7
View File
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DocumentFormat.OpenXml" version="1.0" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" targetFramework="net40" />
<package id="NLog" version="2.0.1.2" targetFramework="net40" />
<package id="NLog.Config" version="2.0.0.2000" targetFramework="net40" />
<package id="NLog.Config" version="2.0.1.2" targetFramework="net40" />
<package id="NLog.Schema" version="2.0.0.2000" targetFramework="net40" />
<package id="NLog.Schema" version="2.0.1.2" targetFramework="net40" />
<package id="DocumentFormat.OpenXml" version="1.0" targetFramework="net4" />
<package id="NLog" version="4.2.3" targetFramework="net4" />
<package id="NLog.Config" version="4.2.3" targetFramework="net4" />
<package id="NLog.Schema" version="4.2.3" targetFramework="net4" />
</packages>
+1
View File
@@ -3,6 +3,7 @@
<styleBundle path="~/Content/css">
<include path="~/Content/Site.css" />
<include path="~/Content/Style.css" />
<include path="~/Content/font-awesome.css" />
</styleBundle>
<styleBundle path="~/Content/themes/base/css">
<include path="~/Content/themes/base/jquery.ui.core.css" />
+10 -7
View File
@@ -29,17 +29,20 @@
</div>
<div class="divSx filtro_2 ui-corner-all" style="padding: 3px; margin-right: 4px; height: 32px;">
<div class="divSx">
<asp:CheckBox ID="chkToggleAddLabels" runat="server" Text="Imposta [L]abels" OnCheckedChanged="chkToggleAddLabels_CheckedChanged" AutoPostBack="True" Checked="false" AccessKey="l" TextAlign="Left" />
<asp:Label runat="server" ID="lblLabels" AssociatedControlID="txtLabels" Text="Filtra [L]abels" Font-Size="0.8em" AccessKey="l" />
<asp:TextBox runat="server" ID="txtLabels" />
</div>
<div class="divSx" runat="server" id="divModLabels">
<asp:Label runat="server" ID="lblAddRemLabels" AssociatedControlID="btnReset" Text="(on selected)" Font-Size="0.8em" />
<asp:Button runat="server" ID="btnReset" Text="Reset Selected" />
<asp:Button runat="server" ID="btnAdd" Text="Add to Selected" />
<div class="divSx">
<asp:CheckBox ID="chkToggleAddLabels" runat="server" Text="Mo[d]ifica" OnCheckedChanged="chkToggleAddLabels_CheckedChanged" AutoPostBack="True" Checked="false" AccessKey="g" TextAlign="Left" />
</div>
<div class="divSx" runat="server" id="divModLabels">
<asp:Label runat="server" ID="lblBtns" AssociatedControlID="lbtAddLabel" Text="&nbsp;" Font-Size="0.8em" />
<asp:DropDownList runat="server" ID="ddlSelLabel" DataSourceID="odsLabel" DataTextField="CodLabel" DataValueField="CodLabel"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsLabel" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="ETS_Data.Ds_ProjEtsTableAdapters.AnagLabelsTableAdapter"></asp:ObjectDataSource>
<asp:LinkButton runat="server" ID="lbtAddLabel" ToolTip="Aggiungi a selezionati" OnClick="lbtAddLabel_Click"><i class="fa fa-plus-square fa-2x"></i> ADD</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtResetLabels" ToolTip="Reset/SVuota selezionati" OnClick="lbtResetLabels_Click"><i class="fa fa-recycle fa-2x"></i> RES</asp:LinkButton>
</div>
</div>
</div>
<uc3:mod_commesseFull ID="mod_commesseFull1" runat="server" />
</asp:Content>
+24 -1
View File
@@ -179,8 +179,31 @@ namespace PROJ_ETS
protected void chkToggleAddLabels_CheckedChanged(object sender, EventArgs e)
{
showAddLabels = chkToggleAddLabels.Checked;
divModLabels.Visible = showAddLabels;
fixAddLabeld();
mod_commesseFull1.doUpdate();
}
private void fixAddLabeld()
{
divModLabels.Visible = showAddLabels;
if(showAddLabels)
{
chkToggleAddLabels.Text = "Chiu[d]i";
}
else
{
chkToggleAddLabels.Text = "Mo[d]ifica";
}
}
protected void lbtAddLabel_Click(object sender, EventArgs e)
{
mod_commesseFull1.addLabel4Sel(ddlSelLabel.SelectedValue);
}
protected void lbtResetLabels_Click(object sender, EventArgs e)
{
mod_commesseFull1.resetLabel4Sel();
}
}
}
+35 -8
View File
@@ -94,13 +94,13 @@ namespace PROJ_ETS {
protected global::System.Web.UI.WebControls.TextBox txtCerca;
/// <summary>
/// chkToggleAddLabels control.
/// lblLabels control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkToggleAddLabels;
protected global::System.Web.UI.WebControls.Label lblLabels;
/// <summary>
/// txtLabels control.
@@ -111,6 +111,15 @@ namespace PROJ_ETS {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtLabels;
/// <summary>
/// chkToggleAddLabels control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkToggleAddLabels;
/// <summary>
/// divModLabels control.
/// </summary>
@@ -121,31 +130,49 @@ namespace PROJ_ETS {
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divModLabels;
/// <summary>
/// lblAddRemLabels control.
/// lblBtns control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblAddRemLabels;
protected global::System.Web.UI.WebControls.Label lblBtns;
/// <summary>
/// btnReset control.
/// ddlSelLabel control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnReset;
protected global::System.Web.UI.WebControls.DropDownList ddlSelLabel;
/// <summary>
/// btnAdd control.
/// odsLabel control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnAdd;
protected global::System.Web.UI.WebControls.ObjectDataSource odsLabel;
/// <summary>
/// lbtAddLabel control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtAddLabel;
/// <summary>
/// lbtResetLabels control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtResetLabels;
/// <summary>
/// mod_commesseFull1 control.
+6
View File
@@ -121,6 +121,12 @@ q {
font-size: 8pt;
}
/*#endregion */
/*Gestione label commessa*/
.lblBox {
border: 1px solid #0A64A4;
background-color: #B8E1FD;
padding: 2px 4px;
}
/* Paginazione... */
.GridPager a,
.GridPager span {
+6 -3
View File
@@ -1,6 +1,4 @@
/*#region area master page */
html, body, div, span, applet, object, iframe,
@@ -75,7 +73,12 @@ blockquote, q {
/*#endregion */
/*Gestione label commessa*/
.lblBox{
border: 1px solid #0A64A4;
background-color: #B8E1FD;
padding: 2px 4px;
}
/* Paginazione... */
.GridPager a, .GridPager span {
File diff suppressed because one or more lines are too long
+358 -4
View File
@@ -1,13 +1,13 @@
/*!
* Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
* Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.2.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');
src: url('../fonts/fontawesome-webfont.eot?v=4.4.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -64,6 +64,19 @@
border: solid 0.08em #eeeeee;
border-radius: .1em;
}
.fa-pull-left {
float: left;
}
.fa-pull-right {
float: right;
}
.fa.fa-pull-left {
margin-right: .3em;
}
.fa.fa-pull-right {
margin-left: .3em;
}
/* Deprecated as of 4.4.0 */
.pull-right {
float: right;
}
@@ -80,6 +93,10 @@
-webkit-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
}
.fa-pulse {
-webkit-animation: fa-spin 1s infinite steps(8);
animation: fa-spin 1s infinite steps(8);
}
@-webkit-keyframes fa-spin {
0% {
-webkit-transform: rotate(0deg);
@@ -610,6 +627,7 @@
.fa-twitter:before {
content: "\f099";
}
.fa-facebook-f:before,
.fa-facebook:before {
content: "\f09a";
}
@@ -622,6 +640,7 @@
.fa-credit-card:before {
content: "\f09d";
}
.fa-feed:before,
.fa-rss:before {
content: "\f09e";
}
@@ -1259,7 +1278,8 @@
.fa-male:before {
content: "\f183";
}
.fa-gittip:before {
.fa-gittip:before,
.fa-gratipay:before {
content: "\f184";
}
.fa-sun-o:before {
@@ -1502,6 +1522,8 @@
.fa-git:before {
content: "\f1d3";
}
.fa-y-combinator-square:before,
.fa-yc-square:before,
.fa-hacker-news:before {
content: "\f1d4";
}
@@ -1670,3 +1692,335 @@
.fa-meanpath:before {
content: "\f20c";
}
.fa-buysellads:before {
content: "\f20d";
}
.fa-connectdevelop:before {
content: "\f20e";
}
.fa-dashcube:before {
content: "\f210";
}
.fa-forumbee:before {
content: "\f211";
}
.fa-leanpub:before {
content: "\f212";
}
.fa-sellsy:before {
content: "\f213";
}
.fa-shirtsinbulk:before {
content: "\f214";
}
.fa-simplybuilt:before {
content: "\f215";
}
.fa-skyatlas:before {
content: "\f216";
}
.fa-cart-plus:before {
content: "\f217";
}
.fa-cart-arrow-down:before {
content: "\f218";
}
.fa-diamond:before {
content: "\f219";
}
.fa-ship:before {
content: "\f21a";
}
.fa-user-secret:before {
content: "\f21b";
}
.fa-motorcycle:before {
content: "\f21c";
}
.fa-street-view:before {
content: "\f21d";
}
.fa-heartbeat:before {
content: "\f21e";
}
.fa-venus:before {
content: "\f221";
}
.fa-mars:before {
content: "\f222";
}
.fa-mercury:before {
content: "\f223";
}
.fa-intersex:before,
.fa-transgender:before {
content: "\f224";
}
.fa-transgender-alt:before {
content: "\f225";
}
.fa-venus-double:before {
content: "\f226";
}
.fa-mars-double:before {
content: "\f227";
}
.fa-venus-mars:before {
content: "\f228";
}
.fa-mars-stroke:before {
content: "\f229";
}
.fa-mars-stroke-v:before {
content: "\f22a";
}
.fa-mars-stroke-h:before {
content: "\f22b";
}
.fa-neuter:before {
content: "\f22c";
}
.fa-genderless:before {
content: "\f22d";
}
.fa-facebook-official:before {
content: "\f230";
}
.fa-pinterest-p:before {
content: "\f231";
}
.fa-whatsapp:before {
content: "\f232";
}
.fa-server:before {
content: "\f233";
}
.fa-user-plus:before {
content: "\f234";
}
.fa-user-times:before {
content: "\f235";
}
.fa-hotel:before,
.fa-bed:before {
content: "\f236";
}
.fa-viacoin:before {
content: "\f237";
}
.fa-train:before {
content: "\f238";
}
.fa-subway:before {
content: "\f239";
}
.fa-medium:before {
content: "\f23a";
}
.fa-yc:before,
.fa-y-combinator:before {
content: "\f23b";
}
.fa-optin-monster:before {
content: "\f23c";
}
.fa-opencart:before {
content: "\f23d";
}
.fa-expeditedssl:before {
content: "\f23e";
}
.fa-battery-4:before,
.fa-battery-full:before {
content: "\f240";
}
.fa-battery-3:before,
.fa-battery-three-quarters:before {
content: "\f241";
}
.fa-battery-2:before,
.fa-battery-half:before {
content: "\f242";
}
.fa-battery-1:before,
.fa-battery-quarter:before {
content: "\f243";
}
.fa-battery-0:before,
.fa-battery-empty:before {
content: "\f244";
}
.fa-mouse-pointer:before {
content: "\f245";
}
.fa-i-cursor:before {
content: "\f246";
}
.fa-object-group:before {
content: "\f247";
}
.fa-object-ungroup:before {
content: "\f248";
}
.fa-sticky-note:before {
content: "\f249";
}
.fa-sticky-note-o:before {
content: "\f24a";
}
.fa-cc-jcb:before {
content: "\f24b";
}
.fa-cc-diners-club:before {
content: "\f24c";
}
.fa-clone:before {
content: "\f24d";
}
.fa-balance-scale:before {
content: "\f24e";
}
.fa-hourglass-o:before {
content: "\f250";
}
.fa-hourglass-1:before,
.fa-hourglass-start:before {
content: "\f251";
}
.fa-hourglass-2:before,
.fa-hourglass-half:before {
content: "\f252";
}
.fa-hourglass-3:before,
.fa-hourglass-end:before {
content: "\f253";
}
.fa-hourglass:before {
content: "\f254";
}
.fa-hand-grab-o:before,
.fa-hand-rock-o:before {
content: "\f255";
}
.fa-hand-stop-o:before,
.fa-hand-paper-o:before {
content: "\f256";
}
.fa-hand-scissors-o:before {
content: "\f257";
}
.fa-hand-lizard-o:before {
content: "\f258";
}
.fa-hand-spock-o:before {
content: "\f259";
}
.fa-hand-pointer-o:before {
content: "\f25a";
}
.fa-hand-peace-o:before {
content: "\f25b";
}
.fa-trademark:before {
content: "\f25c";
}
.fa-registered:before {
content: "\f25d";
}
.fa-creative-commons:before {
content: "\f25e";
}
.fa-gg:before {
content: "\f260";
}
.fa-gg-circle:before {
content: "\f261";
}
.fa-tripadvisor:before {
content: "\f262";
}
.fa-odnoklassniki:before {
content: "\f263";
}
.fa-odnoklassniki-square:before {
content: "\f264";
}
.fa-get-pocket:before {
content: "\f265";
}
.fa-wikipedia-w:before {
content: "\f266";
}
.fa-safari:before {
content: "\f267";
}
.fa-chrome:before {
content: "\f268";
}
.fa-firefox:before {
content: "\f269";
}
.fa-opera:before {
content: "\f26a";
}
.fa-internet-explorer:before {
content: "\f26b";
}
.fa-tv:before,
.fa-television:before {
content: "\f26c";
}
.fa-contao:before {
content: "\f26d";
}
.fa-500px:before {
content: "\f26e";
}
.fa-amazon:before {
content: "\f270";
}
.fa-calendar-plus-o:before {
content: "\f271";
}
.fa-calendar-minus-o:before {
content: "\f272";
}
.fa-calendar-times-o:before {
content: "\f273";
}
.fa-calendar-check-o:before {
content: "\f274";
}
.fa-industry:before {
content: "\f275";
}
.fa-map-pin:before {
content: "\f276";
}
.fa-map-signs:before {
content: "\f277";
}
.fa-map-o:before {
content: "\f278";
}
.fa-map:before {
content: "\f279";
}
.fa-commenting:before {
content: "\f27a";
}
.fa-commenting-o:before {
content: "\f27b";
}
.fa-houzz:before {
content: "\f27c";
}
.fa-vimeo:before {
content: "\f27d";
}
.fa-black-tie:before {
content: "\f27e";
}
.fa-fonticons:before {
content: "\f280";
}
File diff suppressed because one or more lines are too long
+25 -10
View File
@@ -1,27 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
<!-- optional, add some variabeles
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<!--
See http://nlog-project.org/wiki/Configuration_file
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>
<!-- file target -->
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${message}" archiveEvery="Day" />
<!--viewer interattivo sentinel... http://sentinel.codeplex.com/-->
<target xsi:type="NLogViewer" name="sentinel" address="udp://127.0.0.1:9999"/>
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Writing events to the a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
</targets>
<rules>
<!-- logging rules -->
<logger name="*" minlevel="Trace" writeTo="f" />
<!--<logger name="*" minlevel="Trace" writeTo="sentinel" />-->
<!-- add your logging rules here -->
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
</rules>
</nlog>
+770 -814
View File
File diff suppressed because it is too large Load Diff
+8 -6
View File
@@ -64,8 +64,9 @@
<Reference Include="Microsoft.ScriptManager.MSAjax">
<HintPath>..\packages\Microsoft.AspNet.ScriptManager.MSAjax.4.5.6\lib\net45\Microsoft.ScriptManager.MSAjax.dll</HintPath>
</Reference>
<Reference Include="NLog">
<HintPath>..\packages\NLog.2.0.1.2\lib\net45\NLog.dll</HintPath>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -520,14 +521,15 @@
<Content Include="help\files\file_409\Risorse_PROJ-ETS.pdf" />
<Content Include="help\files\file_410\Situazione_Iniziale.pdf" />
<Content Include="help\files\file_411\Requisiti_Offerta_PROJ-ETS.pdf" />
<Content Include="fonts\fontawesome-webfont.woff" />
<Content Include="fonts\fontawesome-webfont.ttf" />
<Content Include="fonts\fontawesome-webfont.eot" />
<Content Include="fonts\FontAwesome.otf" />
<None Include="compilerconfig.json" />
<None Include="compilerconfig.json.defaults">
<DependentUpon>compilerconfig.json</DependentUpon>
</None>
<Content Include="fonts\FontAwesome.otf" />
<Content Include="fonts\fontawesome-webfont.woff2" />
<Content Include="fonts\fontawesome-webfont.woff" />
<Content Include="fonts\fontawesome-webfont.ttf" />
<Content Include="fonts\fontawesome-webfont.eot" />
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
@@ -83,16 +83,18 @@
</asp:TemplateField>
<asp:TemplateField ItemStyle-HorizontalAlign="Left" HeaderText="Commessa / Fasi" SortExpression="nomeProj">
<ItemTemplate>
<div class="divSx">
<asp:Image runat="server" ID="imgSpaz" Width='<%# widthByCod(Eval("codFase")) %>' ImageUrl="~/images/EmptyImg.png" />
</div>
<div class="divSx">
<div style="text-align: left; padding: 2px 3px 2px 3px;" class='<%# classByCod(Eval("codFase")) %>'>
<asp:Label ID="nomeFaseLabel" runat="server" Text='<%# Eval("nomeFase") %>' Font-Strikeout='<%# invBool(Eval("Attivo")) %>'
Font-Bold="true" />
<div style="padding: 0 0.5em;">
<div class="divSx">
<asp:Image runat="server" ID="imgSpaz" Width='<%# widthByCod(Eval("codFase")) %>' ImageUrl="~/images/EmptyImg.png" />
</div>
<div class="textGrigio" style="text-align: left; padding: 2px 3px 2px 3px;">
<asp:Label ID="descrizioneFaseLabel" runat="server" Text='<%# Eval("descrizioneFase") %>' Font-Size="7pt" />
<div class="divSx">
<div style="text-align: left; padding: 2px 3px 2px 3px;" class='<%# classByCod(Eval("codFase")) %>'>
<asp:Label ID="nomeFaseLabel" runat="server" Text='<%# Eval("nomeFase") %>' Font-Strikeout='<%# invBool(Eval("Attivo")) %>'
Font-Bold="true" />
</div>
<div class="textGrigio" style="text-align: left; padding: 2px 3px 2px 3px;">
<asp:Label ID="descrizioneFaseLabel" runat="server" Text='<%# Eval("descrizioneFase") %>' Font-Size="7pt" />
</div>
</div>
</div>
</ItemTemplate>
@@ -108,6 +110,20 @@
</EditItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
<asp:TemplateField HeaderText="Lab." SortExpression="Labels" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<div class="divDx" style="padding: 0.75em;">
<asp:Label ID="lblLabelsComm" runat="server" Text='<%# Eval("Labels","<span class=\"lblBox\">{0}</span>") %>' />
</div>
</ItemTemplate>
<EditItemTemplate>
<div class="divDx" style="padding: 0.75em;">
<asp:Label ID="lblLabelsComm" runat="server" Text='<%# Eval("Labels","<span class=\"lblBox\">{0}</span>") %>' />
</div>
</EditItemTemplate>
<FooterTemplate>
</FooterTemplate>
</asp:TemplateField>
<%--<asp:TemplateField HeaderText="T" SortExpression="enableTime">
<ItemTemplate>
<asp:CheckBox ID="chkenableTime" runat="server" Checked='<%# Eval("enableTime") %>' Enabled="false" ToolTip="Time Track Attivo (s/n)" />
@@ -802,6 +802,46 @@ namespace PROJ_ETS.WebUserControls
grView.PageSize = utils.pageSize;
}
/// <summary>
/// resetta eliminando label x commesse/fasi selezionate
/// </summary>
public void resetLabel4Sel()
{
int value = 0;
// sposto i files selezionati secondo i dati in sessione
foreach (GridViewRow riga in grView.Rows)
{
if (((CheckBox)riga.FindControl("chkSelect")).Checked)
{
// devo salvare file con le info relative...
value = Convert.ToInt32(((Label)riga.FindControl("lblValue")).Text);
DataProxy_ProjEts.DP.taL2C.deleteByFase(value);
}
}
// aggiorno gridView...
grView.DataBind();
}
/// <summary>
/// aggiunge label x commesse/fasi selezionate
/// </summary>
/// <param name="codLabel"></param>
public void addLabel4Sel(string codLabel)
{
int value = 0;
// sposto i files selezionati secondo i dati in sessione
foreach (GridViewRow riga in grView.Rows)
{
if (((CheckBox)riga.FindControl("chkSelect")).Checked)
{
// devo salvare file con le info relative...
value = Convert.ToInt32(((Label)riga.FindControl("lblValue")).Text);
DataProxy_ProjEts.DP.taL2C.Insert(value, codLabel);
}
}
// aggiorno gridView...
grView.DataBind();
}
#endregion
}
Binary file not shown.
+25 -10
View File
@@ -1,27 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
<!-- optional, add some variabeles
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<!--
See http://nlog-project.org/wiki/Configuration_file
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>
<!-- file target -->
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${message}" archiveEvery="Day" />
<!--viewer interattivo sentinel... http://sentinel.codeplex.com/-->
<target xsi:type="NLogViewer" name="sentinel" address="udp://127.0.0.1:9999"/>
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Writing events to the a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
</targets>
<rules>
<!-- logging rules -->
<logger name="*" minlevel="Trace" writeTo="f" />
<!--<logger name="*" minlevel="Trace" writeTo="sentinel" />-->
<!-- add your logging rules here -->
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
</rules>
</nlog>
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.