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

primo ok x salvataggio nuova fascia oraria comunicata...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-01-29 09:41:35 +01:00
parent a175c8e7ce
commit 9cfe0a2815
15 changed files with 105 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebSCR/v14/.suo
BIN
View File
Binary file not shown.
WebSCR/UpdateSql/update_v_2.0.sql
+13
View File
@@ -0,0 +1,13 @@
------------------------------------------------------------------------------------------
-- UPGRADE V 2.0
------------------------------------------------------------------------------------------
-- IN PRIMIS backup db + sito
-- ESEGUIRE ALLINEAMENTO con procedura automatica dacpac
-- aggiornare contenuto delle date/ora comunicate (inizio/fine)
update impegni
set DataOraComFrom = DATEADD(minute, -30, DataOra)
update impegni
set DataOraComTo = DATEADD(minute, 30, DataOra)
WebSCR/WebSCR.csproj
+1
View File
@@ -434,6 +434,7 @@
<SubType>Designer</SubType>
</Content>
<Content Include="Scripts\jquery-2.1.4.min.map" />
<Content Include="UpdateSql\update_v_2.0.sql" />
<None Include="Web.WinLab.config">
<DependentUpon>Web.config</DependentUpon>
<SubType>Designer</SubType>
WebSCR/WebUserControls/mod_impegno.ascx
+9 -7
View File
@@ -21,9 +21,9 @@
</div>
</div>
<div class="ui-block-c text-center">
<label for="lblOrarioCom">ORARIO COMUNICATO</label>
<%--<asp:Label runat="server" ID="lblOrarioCom" CssClass="tStrong"><%# string.Format("{0: dddd dd/MM/yy HH:mm} --> {1:HH:mm}", Eval("DataOraCom"),Convert.ToDateTime(Eval("DataOraCom")).AddHours(1)) %></asp:Label>--%>
<uc1:mod_selDataOra runat="server" ID="mod_selDataOra" dataOraSel='<%# Bind("DataOraCom") %>' /> --> +1h
<%--<label for="lblOrarioCom">ORARIO COMUNICATO</label>--%>
<uc1:mod_selDataOra runat="server" ID="mod_selDataOraFrom" dataOraSel='<%# Bind("DataOraComFrom") %>' />
<uc1:mod_selDataOra runat="server" ID="mod_selDataOraTo" dataOraSel='<%# Bind("DataOraComTo") %>' showData="false" />
</div>
</div>
<div class="ui-grid-b">
@@ -63,7 +63,7 @@
</div>
</div>
</div>
<div class="ui-block-c">
<div class="ui-block-c" style="margin-top: 1.5em;">
<asp:DropDownList runat="server" ID="ddlTipoOrario" DataSourceID="odsTipoOrario" DataTextField="label" DataValueField="value" SelectedValue='<%# Bind("TipoOrario") %>'></asp:DropDownList>
<asp:ObjectDataSource ID="odsTipoOrario" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getValid" TypeName="WebSCR_data.DS_UtilityTableAdapters.ListValuesTableAdapter">
<SelectParameters>
@@ -152,8 +152,7 @@
</div>
<div class="ui-block-c text-center">
<label for="lblOrarioCom">ORARIO COMUNICATO</label>
<asp:Label runat="server" ID="lblOrarioCom" CssClass="tStrong"><%# string.Format("{0: dddd dd/MM/yy HH:mm} --> {1:HH:mm}", Eval("DataOraCom"),Convert.ToDateTime(Eval("DataOraCom")).AddHours(1)) %></asp:Label>
<%--<uc1:mod_selDataOra runat="server" ID="mod_selDataOra" dataOraSel='<%# Eval("DataOraCom") %>' />--%>
<asp:Label runat="server" ID="lblOrarioCom" CssClass="tStrong"><%# string.Format("{0: dddd dd/MM/yy HH:mm} --> {1:HH:mm}", Eval("DataOraComFrom"),Eval("DataOraComTo")) %></asp:Label>
</div>
</div>
<div class="ui-grid-b">
@@ -193,7 +192,7 @@
</div>
</div>
</div>
<div class="ui-block-c">
<div class="ui-block-c" style="margin-top: 1.5em;">
<asp:DropDownList runat="server" ID="ddlTipoOrario" DataSourceID="odsTipoOrario" DataTextField="label" DataValueField="value" SelectedValue='<%# Bind("TipoOrario") %>'></asp:DropDownList>
<asp:ObjectDataSource ID="odsTipoOrario" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getValid" TypeName="WebSCR_data.DS_UtilityTableAdapters.ListValuesTableAdapter">
<SelectParameters>
@@ -283,6 +282,9 @@
<asp:Parameter Name="Ascensore" Type="Int32" />
<asp:Parameter Name="PianoCons" Type="Int32" />
<asp:Parameter Name="UserMod" Type="String" />
<asp:Parameter Name="IntAperto" Type="Boolean" />
<asp:Parameter Name="DataOraComFrom" Type="DateTime" />
<asp:Parameter Name="DataOraComTo" Type="DateTime" />
</UpdateParameters>
</asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsSquadre" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.AnagSquadreTableAdapter"></asp:ObjectDataSource>
WebSCR/WebUserControls/mod_selDataOra.ascx.cs
+22 -7
View File
@@ -37,12 +37,6 @@ namespace WebSCR.WebUserControls
}
protected void Page_Load(object sender, EventArgs e)
{
#if false
if (!Page.IsPostBack)
{
txtDataSel.Text = dataSel.ToString("yyyy-MM-dd");
}
#endif
}
/// <summary>
/// data-ora selezionata
@@ -76,6 +70,27 @@ namespace WebSCR.WebUserControls
{ }
}
}
public bool showData
{
get
{
return txtDataSel.Visible;
}
set
{
txtDataSel.Visible = value;
}
}
public bool showOra
{
get
{
return ddlOrario.Visible;
}
set
{
ddlOrario.Visible = value;
}
}
}
}
WebSCR/bin/SteamWare.dll
BIN
View File
Binary file not shown.
WebSCR/bin/WebSCR.dll
BIN
View File
Binary file not shown.
WebSCR/bin/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR_data/DS_Applicazione.Designer.cs
Generated
+56 -14
View File
@@ -2276,7 +2276,9 @@ namespace WebSCR_data {
private global::System.Data.DataColumn columnIdxImpegno;
private global::System.Data.DataColumn columnDataOraCom;
private global::System.Data.DataColumn columnDataOraComFrom;
private global::System.Data.DataColumn columnDataOraComTo;
private global::System.Data.DataColumn columnDataOra;
@@ -2403,9 +2405,17 @@ namespace WebSCR_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn DataOraComColumn {
public global::System.Data.DataColumn DataOraComFromColumn {
get {
return this.columnDataOraCom;
return this.columnDataOraComFrom;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn DataOraComToColumn {
get {
return this.columnDataOraComTo;
}
}
@@ -2776,7 +2786,8 @@ namespace WebSCR_data {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public ImpegniRow AddImpegniRow(
int IdxImpegno,
System.DateTime DataOraCom,
System.DateTime DataOraComFrom,
System.DateTime DataOraComTo,
System.DateTime DataOra,
string TipoOrario,
string CodCliente,
@@ -2821,7 +2832,8 @@ namespace WebSCR_data {
ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
IdxImpegno,
DataOraCom,
DataOraComFrom,
DataOraComTo,
DataOra,
TipoOrario,
CodCliente,
@@ -2893,7 +2905,8 @@ namespace WebSCR_data {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
internal void InitVars() {
this.columnIdxImpegno = base.Columns["IdxImpegno"];
this.columnDataOraCom = base.Columns["DataOraCom"];
this.columnDataOraComFrom = base.Columns["DataOraComFrom"];
this.columnDataOraComTo = base.Columns["DataOraComTo"];
this.columnDataOra = base.Columns["DataOra"];
this.columnTipoOrario = base.Columns["TipoOrario"];
this.columnCodCliente = base.Columns["CodCliente"];
@@ -2942,8 +2955,10 @@ namespace WebSCR_data {
private void InitClass() {
this.columnIdxImpegno = new global::System.Data.DataColumn("IdxImpegno", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnIdxImpegno);
this.columnDataOraCom = new global::System.Data.DataColumn("DataOraCom", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDataOraCom);
this.columnDataOraComFrom = new global::System.Data.DataColumn("DataOraComFrom", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDataOraComFrom);
this.columnDataOraComTo = new global::System.Data.DataColumn("DataOraComTo", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDataOraComTo);
this.columnDataOra = new global::System.Data.DataColumn("DataOra", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDataOra);
this.columnTipoOrario = new global::System.Data.DataColumn("TipoOrario", typeof(string), null, global::System.Data.MappingType.Element);
@@ -3030,8 +3045,10 @@ namespace WebSCR_data {
this.columnIdxImpegno}, true));
this.columnIdxImpegno.AllowDBNull = false;
this.columnIdxImpegno.Unique = true;
this.columnDataOraCom.AllowDBNull = false;
this.columnDataOraCom.Caption = "DataOra";
this.columnDataOraComFrom.AllowDBNull = false;
this.columnDataOraComFrom.Caption = "DataOra";
this.columnDataOraComTo.AllowDBNull = false;
this.columnDataOraComTo.Caption = "DataOra";
this.columnDataOra.AllowDBNull = false;
this.columnTipoOrario.AllowDBNull = false;
this.columnTipoOrario.MaxLength = 10;
@@ -7317,12 +7334,23 @@ namespace WebSCR_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public System.DateTime DataOraCom {
public System.DateTime DataOraComFrom {
get {
return ((global::System.DateTime)(this[this.tableImpegni.DataOraComColumn]));
return ((global::System.DateTime)(this[this.tableImpegni.DataOraComFromColumn]));
}
set {
this[this.tableImpegni.DataOraComColumn] = value;
this[this.tableImpegni.DataOraComFromColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public System.DateTime DataOraComTo {
get {
return ((global::System.DateTime)(this[this.tableImpegni.DataOraComToColumn]));
}
set {
this[this.tableImpegni.DataOraComToColumn] = value;
}
}
@@ -13060,6 +13088,8 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PianoCons", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IntAperto", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraComFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraComTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[10].Connection = this.Connection;
this._commandCollection[10].CommandText = "dbo.stp_Imp_updNoteInt";
@@ -13389,7 +13419,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int updateQuery(global::System.Nullable<int> Original_IdxImpegno, string TipoOrario, string CodSquadra, string RifOC, string NoteGen, string UrlDoc, global::System.Nullable<int> NumOp, global::System.Nullable<int> RitUsato, global::System.Nullable<int> Ascensore, global::System.Nullable<int> PianoCons, string UserMod, global::System.Nullable<bool> IntAperto) {
public virtual int updateQuery(global::System.Nullable<int> Original_IdxImpegno, string TipoOrario, string CodSquadra, string RifOC, string NoteGen, string UrlDoc, global::System.Nullable<int> NumOp, global::System.Nullable<int> RitUsato, global::System.Nullable<int> Ascensore, global::System.Nullable<int> PianoCons, string UserMod, global::System.Nullable<bool> IntAperto, global::System.Nullable<global::System.DateTime> DataOraComFrom, global::System.Nullable<global::System.DateTime> DataOraComTo) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9];
if ((Original_IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value));
@@ -13463,6 +13493,18 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
else {
command.Parameters[12].Value = global::System.DBNull.Value;
}
if ((DataOraComFrom.HasValue == true)) {
command.Parameters[13].Value = ((System.DateTime)(DataOraComFrom.Value));
}
else {
command.Parameters[13].Value = global::System.DBNull.Value;
}
if ((DataOraComTo.HasValue == true)) {
command.Parameters[14].Value = ((System.DateTime)(DataOraComTo.Value));
}
else {
command.Parameters[14].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
WebSCR_data/DS_Applicazione.xsd
+4 -1
View File
@@ -735,6 +735,8 @@ FROM v_elencoImpegni</CommandText>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PianoCons" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IntAperto" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DataOraComFrom" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DataOraComTo" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -1526,7 +1528,8 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)</Co
<xs:complexType>
<xs:sequence>
<xs:element name="IdxImpegno" msprop:Generator_ColumnVarNameInTable="columnIdxImpegno" msprop:Generator_ColumnPropNameInRow="IdxImpegno" msprop:Generator_ColumnPropNameInTable="IdxImpegnoColumn" msprop:Generator_UserColumnName="IdxImpegno" type="xs:int" />
<xs:element name="DataOraCom" msdata:Caption="DataOra" msprop:Generator_ColumnVarNameInTable="columnDataOraCom" msprop:Generator_ColumnPropNameInRow="DataOraCom" msprop:Generator_ColumnPropNameInTable="DataOraComColumn" msprop:Generator_UserColumnName="DataOraCom" type="xs:dateTime" />
<xs:element name="DataOraComFrom" msdata:Caption="DataOra" msprop:Generator_ColumnVarNameInTable="columnDataOraComFrom" msprop:Generator_ColumnPropNameInRow="DataOraComFrom" msprop:Generator_ColumnPropNameInTable="DataOraComFromColumn" msprop:Generator_UserColumnName="DataOraComFrom" type="xs:dateTime" />
<xs:element name="DataOraComTo" msdata:Caption="DataOra" msprop:Generator_ColumnVarNameInTable="columnDataOraComTo" msprop:Generator_ColumnPropNameInRow="DataOraComTo" msprop:Generator_ColumnPropNameInTable="DataOraComToColumn" msprop:Generator_UserColumnName="DataOraComTo" type="xs:dateTime" />
<xs:element name="DataOra" msprop:Generator_ColumnVarNameInTable="columnDataOra" msprop:Generator_ColumnPropNameInRow="DataOra" msprop:Generator_ColumnPropNameInTable="DataOraColumn" msprop:Generator_UserColumnName="DataOra" type="xs:dateTime" />
<xs:element name="TipoOrario" msprop:Generator_ColumnVarNameInTable="columnTipoOrario" msprop:Generator_ColumnPropNameInRow="TipoOrario" msprop:Generator_ColumnPropNameInTable="TipoOrarioColumn" msprop:Generator_UserColumnName="TipoOrario">
<xs:simpleType>
WebSCR_data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Debug/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
WebSCR_data/obj/Debug/WebSCR_data.dll
BIN
View File
Binary file not shown.