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

gestione preliminare rilascio settimana impostato

Browse Source
This commit is contained in:
Samuele Locatelli
2013-09-20 09:19:31 +02:00
parent 4e5e465d4a
commit 2ef588480d
24 changed files with 1344 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/DataProxy_ProjEts.cs
+14 -4
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.ReleasedWeekTableAdapter taReW;
/* DS_utilsProjEts */
public DS_utilsProjEtsTableAdapters.v_selClientiTableAdapter taSelCli;
public DS_utilsProjEtsTableAdapters.v_selProgettiTableAdapter taSelPro;
@@ -46,6 +47,7 @@ namespace ETS_Data
taD2ATR = new Ds_ProjEtsTableAdapters.Dip2ATRTableAdapter();
taDip = new Ds_ProjEtsTableAdapters.DipendentiTableAdapter();
taIR = new Ds_ProjEtsTableAdapters.ImpiegoRisorseTableAdapter();
taReW = new Ds_ProjEtsTableAdapters.ReleasedWeekTableAdapter();
taSelCli = new DS_utilsProjEtsTableAdapters.v_selClientiTableAdapter();
taSelPro = new DS_utilsProjEtsTableAdapters.v_selProgettiTableAdapter();
taSelCom = new DS_utilsProjEtsTableAdapters.v_selCommesseTableAdapter();
@@ -68,6 +70,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");
taReW.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taSelCli.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taSelPro.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
taSelCom.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString");
@@ -144,13 +147,20 @@ namespace ETS_Data
/// <summary>
/// effettua export su GPW dei singoli dipendenti delle ore programmate x la settimana indicata
/// </summary>
/// <param name="anno"></param>
/// <param name="settimana"></param>
/// <param name="anno">anno</param>
/// <param name="settimana">num settimana 1-53</param>
/// <param name="UsernameAD">Utente che congela la settimana</param>
/// <returns></returns>
public bool esportaBazaarSuGPW(int anno, int settimana)
public bool esportaBazaarSuGPW(int anno, int settimana, string UsernameAD)
{
bool answ = false;
try
{
taBaz.copy2GPW(anno, settimana, UsernameAD);
answ = true;
}
catch
{ }
return answ;
}
ETS_Data/Ds_ProjEts.xsd
+125 -3
View File
@@ -1125,7 +1125,20 @@ SELECT Anno, Sett, idxDipendente, idxFase, Allocazione, SchemaWeek, OreTot FROM
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_creaBulkByIdxFase" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="creaBulkByIdxFase" Modifier="Public" Name="creaBulkByIdxFase" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="creaBulkByIdxFase">
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_copy2GPW" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="copy2GPW" Modifier="Public" Name="copy2GPW" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="copy2GPW">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_BAZ_copy2GPW</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="@Anno" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Sett" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UsernameAD" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_creaBulkByIdxFase" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="creaBulkByIdxFase" Modifier="Public" Name="creaBulkByIdxFase" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="creaBulkByIdxFase">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_BAZ_creaBulkByIdxFase</CommandText>
@@ -1138,7 +1151,7 @@ SELECT Anno, Sett, idxDipendente, idxFase, Allocazione, SchemaWeek, OreTot FROM
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_deleteByIdxFase" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteByIdxFase" Modifier="Public" Name="deleteByIdxFase" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="deleteByIdxFase">
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_deleteByIdxFase" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="deleteByIdxFase" Modifier="Public" Name="deleteByIdxFase" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="deleteByIdxFase">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_BAZ_deleteByIdxFase</CommandText>
@@ -1190,7 +1203,20 @@ SELECT Anno, Sett, idxDipendente, idxFase, Allocazione, SchemaWeek, OreTot FROM
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_updateQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="updateQuery">
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_ResetCopyGPW" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="resetCopyGPW" Modifier="Public" Name="resetCopyGPW" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy5" UserSourceName="resetCopyGPW">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_BAZ_ResetCopyGPW</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="@Anno" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Sett" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UsernameAD" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_BAZ_updateQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="updateQuery" Modifier="Public" Name="updateQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy4" UserSourceName="updateQuery">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_BAZ_updateQuery</CommandText>
@@ -1347,6 +1373,81 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann
</DbSource>
</Sources>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ReleasedWeekTableAdapter" GeneratorDataComponentClassName="ReleasedWeekTableAdapter" Name="ReleasedWeek" UserDataComponentName="ReleasedWeekTableAdapter">
<MainSource>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.ReleasedWeek" 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].[ReleasedWeek] WHERE (([Anno] = @Original_Anno) AND ([Sett] = @Original_Sett) AND ((@IsNull_UsernameAD = 1 AND [UsernameAD] IS NULL) OR ([UsernameAD] = @Original_UsernameAD)) AND ((@IsNull_dataConf = 1 AND [dataConf] IS NULL) OR ([dataConf] = @Original_dataConf)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Anno" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Anno" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Sett" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Sett" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_UsernameAD" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="UsernameAD" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_UsernameAD" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UsernameAD" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_dataConf" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="dataConf" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_dataConf" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dataConf" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [dbo].[ReleasedWeek] ([Anno], [Sett], [UsernameAD], [dataConf]) VALUES (@Anno, @Sett, @UsernameAD, @dataConf);
SELECT Anno, Sett, UsernameAD, dataConf FROM ReleasedWeek WHERE (Anno = @Anno) AND (Sett = @Sett)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Anno" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Anno" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Sett" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Sett" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@UsernameAD" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UsernameAD" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@dataConf" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dataConf" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT Anno, Sett, UsernameAD, dataConf FROM dbo.ReleasedWeek</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [dbo].[ReleasedWeek] SET [Anno] = @Anno, [Sett] = @Sett, [UsernameAD] = @UsernameAD, [dataConf] = @dataConf WHERE (([Anno] = @Original_Anno) AND ([Sett] = @Original_Sett) AND ((@IsNull_UsernameAD = 1 AND [UsernameAD] IS NULL) OR ([UsernameAD] = @Original_UsernameAD)) AND ((@IsNull_dataConf = 1 AND [dataConf] IS NULL) OR ([dataConf] = @Original_dataConf)));
SELECT Anno, Sett, UsernameAD, dataConf FROM ReleasedWeek WHERE (Anno = @Anno) AND (Sett = @Sett)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Anno" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Anno" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Sett" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Sett" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@UsernameAD" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UsernameAD" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@dataConf" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dataConf" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Anno" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Anno" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Sett" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Sett" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_UsernameAD" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="UsernameAD" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_UsernameAD" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UsernameAD" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_dataConf" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="dataConf" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_dataConf" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dataConf" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="Anno" DataSetColumn="Anno" />
<Mapping SourceColumn="Sett" DataSetColumn="Sett" />
<Mapping SourceColumn="UsernameAD" DataSetColumn="UsernameAD" />
<Mapping SourceColumn="dataConf" DataSetColumn="dataConf" />
</Mappings>
<Sources>
<DbSource ConnectionRef="ETS_PROJConnectionString (Settings)" DbObjectName="ETS_PROJ.dbo.stp_ReW_getByAnnoSett" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByAnnoWeek" GetMethodModifier="Public" GetMethodName="getByAnnoWeek" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByAnnoWeek" UserSourceName="getByAnnoWeek">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.stp_ReW_getByAnnoSett</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="@Anno" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Sett" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</Sources>
</TableAdapter>
</Tables>
<Sources />
</DataSource>
@@ -1978,6 +2079,22 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ReleasedWeek" msprop:Generator_TableClassName="ReleasedWeekDataTable" msprop:Generator_TableVarName="tableReleasedWeek" msprop:Generator_RowChangedName="ReleasedWeekRowChanged" msprop:Generator_TablePropName="ReleasedWeek" msprop:Generator_RowDeletingName="ReleasedWeekRowDeleting" msprop:Generator_RowChangingName="ReleasedWeekRowChanging" msprop:Generator_RowEvHandlerName="ReleasedWeekRowChangeEventHandler" msprop:Generator_RowDeletedName="ReleasedWeekRowDeleted" msprop:Generator_RowClassName="ReleasedWeekRow" msprop:Generator_UserTableName="ReleasedWeek" msprop:Generator_RowEvArgName="ReleasedWeekRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="Anno" msprop:Generator_ColumnVarNameInTable="columnAnno" msprop:Generator_ColumnPropNameInRow="Anno" msprop:Generator_ColumnPropNameInTable="AnnoColumn" msprop:Generator_UserColumnName="Anno" type="xs:int" />
<xs:element name="Sett" msprop:Generator_ColumnVarNameInTable="columnSett" msprop:Generator_ColumnPropNameInRow="Sett" msprop:Generator_ColumnPropNameInTable="SettColumn" msprop:Generator_UserColumnName="Sett" type="xs:int" />
<xs:element name="UsernameAD" msprop:Generator_ColumnVarNameInTable="columnUsernameAD" msprop:Generator_ColumnPropNameInRow="UsernameAD" msprop:Generator_ColumnPropNameInTable="UsernameADColumn" msprop:Generator_UserColumnName="UsernameAD" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="dataConf" msprop:Generator_ColumnVarNameInTable="columndataConf" msprop:Generator_ColumnPropNameInRow="dataConf" msprop:Generator_ColumnPropNameInTable="dataConfColumn" msprop:Generator_UserColumnName="dataConf" type="xs:dateTime" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -2040,6 +2157,11 @@ SELECT Anno, Sett, idxDipendente, idxFase, OreTot FROM ImpiegoRisorse WHERE (Ann
<xs:field xpath="mstns:idxDipendente" />
<xs:field xpath="mstns:idxFase" />
</xs:unique>
<xs:unique name="ReleasedWeek_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:ReleasedWeek" />
<xs:field xpath="mstns:Anno" />
<xs:field xpath="mstns:Sett" />
</xs:unique>
</xs:element>
<xs:annotation>
<xs:appinfo>
ETS_Data/Ds_ProjEts.xss
+21 -20
View File
@@ -4,24 +4,25 @@
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="354" 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="234" ViewPortY="364" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:AnagProgetti" ZOrder="19" X="70" Y="36" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:AnagFasi" ZOrder="13" X="495" Y="56" Height="533" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:DatiCommessa" ZOrder="12" X="876" Y="56" Height="533" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="463" />
<Shape ID="DesignTable:DatiCommForn" ZOrder="14" X="1185" Y="69" Height="229" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:DatiCommInteg" ZOrder="15" X="1189" Y="378" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:AnagCommFasi" ZOrder="1" X="532" Y="646" Height="343" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ElencoFasiExpl" ZOrder="9" X="851" Y="651" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BdgtRisorseFasi" ZOrder="8" X="235" Y="679" Height="248" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagTipoRisorse" ZOrder="7" X="69" Y="501" Height="153" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dip2ATR" ZOrder="5" X="72" Y="939" Height="153" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dipendenti" ZOrder="4" X="274" Y="1003" Height="305" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BazaarRisorse" ZOrder="3" X="1175" Y="889" Height="347" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ImpiegoRisorse" ZOrder="2" X="858" Y="1051" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="138" />
<Shape ID="DesignTable:AnagProgetti" ZOrder="20" X="70" Y="36" Height="438" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:AnagFasi" ZOrder="14" X="495" Y="56" Height="533" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:DatiCommessa" ZOrder="13" X="876" Y="56" Height="533" Width="231" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="463" />
<Shape ID="DesignTable:DatiCommForn" ZOrder="15" X="1185" Y="69" Height="229" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:DatiCommInteg" ZOrder="16" X="1189" Y="378" Height="248" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:AnagCommFasi" ZOrder="2" X="532" Y="646" Height="343" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ElencoFasiExpl" ZOrder="10" X="851" Y="651" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BdgtRisorseFasi" ZOrder="9" X="235" Y="679" Height="248" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagTipoRisorse" ZOrder="8" X="69" Y="501" Height="153" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dip2ATR" ZOrder="6" X="72" Y="939" Height="153" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:Dipendenti" ZOrder="5" X="274" Y="1003" Height="305" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BazaarRisorse" ZOrder="4" X="1175" Y="889" Height="347" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:ImpiegoRisorse" ZOrder="3" X="858" Y="1051" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="138" />
<Shape ID="DesignTable:ReleasedWeek" ZOrder="1" X="580" Y="1126" Height="172" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:AnagProgetti_AnagFasi" ZOrder="18" LineWidth="11">
<Connector ID="DesignRelation:AnagProgetti_AnagFasi" ZOrder="19" LineWidth="11">
<RoutePoints>
<Point>
<X>370</X>
@@ -33,7 +34,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:DatiCommessa_AnagFasi" ZOrder="17" LineWidth="11">
<Connector ID="DesignRelation:DatiCommessa_AnagFasi" ZOrder="18" LineWidth="11">
<RoutePoints>
<Point>
<X>876</X>
@@ -45,7 +46,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:DatiCommessa_DatiCommForn" ZOrder="16" LineWidth="11">
<Connector ID="DesignRelation:DatiCommessa_DatiCommForn" ZOrder="17" LineWidth="11">
<RoutePoints>
<Point>
<X>1107</X>
@@ -57,7 +58,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:DatiCommessa_DatiCommInteg" ZOrder="6" LineWidth="11">
<Connector ID="DesignRelation:DatiCommessa_DatiCommInteg" ZOrder="7" LineWidth="11">
<RoutePoints>
<Point>
<X>1107</X>
@@ -77,7 +78,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:AnagFasi_BdgtRisorseFasi" ZOrder="11" LineWidth="11">
<Connector ID="DesignRelation:AnagFasi_BdgtRisorseFasi" ZOrder="12" LineWidth="11">
<RoutePoints>
<Point>
<X>495</X>
@@ -93,7 +94,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_BdgtRisorseFasi_AnagTipoRisorse" ZOrder="10" LineWidth="11">
<Connector ID="DesignRelation:FK_BdgtRisorseFasi_AnagTipoRisorse" ZOrder="11" LineWidth="11">
<RoutePoints>
<Point>
<X>172</X>
ETS_Data/Ds_ProjEts1.Designer.cs
Generated
+1047 -21
View File
File diff suppressed because it is too large Load Diff
ETS_Data/ETS_Data.csproj
+2
View File
@@ -157,6 +157,8 @@
<Content Include="SQL\ETS-GPW\ETS_GPW-PROJ_00183.sql" />
<Content Include="SQL\ETS_anagrafica\ETS_ANAG_00180.sql" />
<Content Include="SQL\ETS_anagrafica\ETS_ANAG_00170.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00216.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00218.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00215.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00212.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00210.sql" />
ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00218.sql
+7
View File
@@ -0,0 +1,7 @@
-- registro versione...
INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(218, GETDATE())
GO
SELECT TOP 10 * FROM LogUpdateDb ORDER BY Versione DESC
GO
PROJ-ETS/PROJ-ETS/Content/Style.css
+16
View File
@@ -508,6 +508,22 @@ A:hover {
padding: 4px;
padding-right: 28px;
}
.btnPinned {
background-image: url(../images/pin_m.png);
background-repeat: no-repeat;
background-position: right;
border: 1px solid #333333;
padding: 4px;
padding-right: 28px;
}
.btnPinnedDis {
background-image: url(../images/pinDis_m.png);
background-repeat: no-repeat;
background-position: right;
border: 1px solid #333333;
padding: 4px;
padding-right: 28px;
}
.btnDelete {
background-image: url(../images/elimina_m.png);
background-repeat: no-repeat;
PROJ-ETS/PROJ-ETS/Content/Style.less
+17
View File
@@ -536,6 +536,23 @@ A:hover {
padding-right: 28px;
}
.btnPinned {
background-image: url(../images/pin_m.png);
background-repeat: no-repeat;
background-position: right;
border: 1px solid #333333;
padding: 4px;
padding-right: 28px;
}
.btnPinnedDis {
background-image: url(../images/pinDis_m.png);
background-repeat: no-repeat;
background-position: right;
border: 1px solid #333333;
padding: 4px;
padding-right: 28px;
}
.btnDelete {
background-image: url(../images/elimina_m.png);
background-repeat: no-repeat;
PROJ-ETS/PROJ-ETS/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
PROJ-ETS/PROJ-ETS/Images/pin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

PROJ-ETS/PROJ-ETS/Images/pinDis_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

PROJ-ETS/PROJ-ETS/Images/pinDis_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 802 B

PROJ-ETS/PROJ-ETS/Images/pinDis_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 591 B

PROJ-ETS/PROJ-ETS/Images/pinDisabled.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

PROJ-ETS/PROJ-ETS/Images/pin_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

PROJ-ETS/PROJ-ETS/Images/pin_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 947 B

PROJ-ETS/PROJ-ETS/Images/pin_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 662 B

PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+8
View File
@@ -270,6 +270,14 @@
<Content Include="Images\orderedList7.png" />
<Content Include="Images\orderedList8.png" />
<Content Include="Images\orderedList9.png" />
<Content Include="Images\pin.png" />
<Content Include="Images\pinDisabled.png" />
<Content Include="Images\pinDis_l.png" />
<Content Include="Images\pinDis_m.png" />
<Content Include="Images\pinDis_s.png" />
<Content Include="Images\pin_l.png" />
<Content Include="Images\pin_m.png" />
<Content Include="Images\pin_s.png" />
<Content Include="Images\Project.png" />
<Content Include="Images\reload_l.png" />
<Content Include="Images\reload_m.png" />
PROJ-ETS/PROJ-ETS/Web.config
+1 -1
View File
@@ -50,7 +50,7 @@
<add key="codTipoRisorsaStd" value="DIS" />
<add key="oreBdgtStd" value="1" />
<!--gestione bazaar-->
<add key="bazCudPastEnabled" value="true"/>
<add key="bazCudPastEnabled" value="false"/>
<add key="soglia1" value="10" />
<add key="soglia2" value="20" />
<add key="soglia3" value="30" />
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx
+3
View File
@@ -9,6 +9,9 @@
<div class="divSx" style="padding: 0px; margin-right: 4px; height: 2em;">
<asp:Button runat="server" ID="btnCloneWeek" Text="Copia Week" ToolTip="Copia le Commesse dalla settimana precedente" CssClass="btnNew" OnClick="btnCloneWeek_Click" Visible='<%# isWritable() && isPowerUser %>' />
</div>
<div class="divSx" style="padding: 0px; margin-right: 4px; height: 2em;">
<asp:Button runat="server" ID="btnReleaseWeek" Text="Rilascia Week" ToolTip="Rilascia il piano settimanale copiando in GPW lo schema delle ore a progetto indicate per la settimana" CssClass="btnNew" OnClick="btnReleaseWeek_Click" Visible='<%# isWritable() && isPowerUser %>' />
</div>
</div>
<div class="clearDiv">
<asp:Panel runat="server" ID="pnlAddNew" Visible="false" CssClass="divSx filtro_1 fontPiccolo ui-corner-all shadowBox">
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
+73 -2
View File
@@ -123,6 +123,16 @@ namespace PROJ_ETS.WebUserControls
/// </summary>
public void doUpdate()
{
setBtnStatus();
caricaDatiBlocco();
disegnaTabella();
}
/// <summary>
/// sistema i vari buttons come visibilità ed abilitazione a seconda dello stato della settimana, del cudEnabled, dei diritti utente...
/// </summary>
private void setBtnStatus()
{
// aggiunta commesse e clona seguono stessa regola di visibilità e abilitazione...
btnAddNew.Enabled = cudEnabled;
btnCloneWeek.Enabled = cudEnabled;
btnAddNew.Visible = isWritable() && isPowerUser;
@@ -132,9 +142,33 @@ namespace PROJ_ETS.WebUserControls
{
btnAddNew.CssClass = "btnDisabled";
btnAddNew.ToolTip = "Modifica non consentita";
btnCloneWeek.CssClass = "btnDisabled";
btnCloneWeek.ToolTip = "Modifica non consentita";
}
caricaDatiBlocco();
disegnaTabella();
else
{
btnAddNew.CssClass = "btnNew";
btnAddNew.ToolTip = "Mostra pannello Aggiungi Commesse";
btnCloneWeek.CssClass = "btnNew";
btnCloneWeek.ToolTip = "Copia le Commesse dalla settimana precedente";
}
// rilascio / congelamento ore in GPW ha sua regola (NON lo mostra direttamente se "scaduto")
btnReleaseWeek.Visible = isWritable() && isPowerUser && cudEnabled;
// a seconda che sia stata rilasciata o meno la settimana mostro sblocco o rilascio settimana...
if (isReleased)
{
btnReleaseWeek.Text = "Sblocca WeekPlan rilasciato";
btnReleaseWeek.CssClass = "btnPinnedDis";
btnReleaseWeek.ToolTip = "Elimina schema orario rilasciato in GPW e sblocca settimana";
}
else
{
btnReleaseWeek.Text = "Rilascia WeekPlan";
btnReleaseWeek.CssClass = "btnPinned";
btnReleaseWeek.ToolTip = "Rilascia il piano settimanale copiando in GPW lo schema delle ore a progetto indicate per la settimana";
}
}
/// <summary>
/// anno selezionato (wrapper)
@@ -494,6 +528,26 @@ namespace PROJ_ETS.WebUserControls
Response.Redirect("Bazaar");
}
/// <summary>
/// rilascia la settimana congelandola ed inserendo in GPW le ore a commessa previste
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnReleaseWeek_Click(object sender, EventArgs e)
{
// controllo se la settimana è rialsciata o meno e di conseguenza opero...
if (isReleased)
{
// sblocco
DataProxy_ProjEts.DP.taBaz.resetCopyGPW(anno, settimana, user_std.UtSn.userNameAD);
}
else
{
// rilascio al settimana salvando ore in GPW e congelandola x modifiche di utenti NON PowerUser
DataProxy_ProjEts.DP.taBaz.copy2GPW(anno, settimana, user_std.UtSn.userNameAD);
}
Response.Redirect("Bazaar");
}
/// <summary>
/// controllo visibilità pannello
/// </summary>
/// <param name="showPnlNew"></param>
@@ -728,5 +782,22 @@ namespace PROJ_ETS.WebUserControls
return user_std.UtSn.userHasRight("CC");
}
}
/// <summary>
/// indica se la settimana sia già stata rilasciata (c'è record in tab ReleasedWeek e quindi è stato esportato su GPW)
/// </summary>
public bool isReleased
{
get
{
bool answ = false;
try
{
answ = DataProxy_ProjEts.DP.taReW.getByAnnoWeek(anno, settimana).Rows.Count > 0;
}
catch
{ }
return answ;
}
}
}
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.designer.cs
Generated
+9
View File
@@ -39,6 +39,15 @@ namespace PROJ_ETS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnCloneWeek;
/// <summary>
/// btnReleaseWeek 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 btnReleaseWeek;
/// <summary>
/// pnlAddNew control.
/// </summary>
PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
BIN
View File
Binary file not shown.