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

Iniziate modifiche x gestione novi campi in impegno (operatore, OC obbligatorio...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-01-20 10:54:10 +01:00
parent 96e79a7c73
commit f9005722ff
29 changed files with 197 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebSCR/v14/.suo
BIN
View File
Binary file not shown.
DataUploader/bin/DataUploader.dll
BIN
View File
Binary file not shown.
VersGen/WebSC.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.9.066.288")]
[assembly: AssemblyFileVersion("1.9.066.288")]
[assembly: AssemblyVersion("2.0.067.294")]
[assembly: AssemblyFileVersion("2.0.067.294")]
[assembly: AssemblyCopyright("Steamware © 2015-2016")]
[assembly: AssemblyCompany("Steamware")]
VersGen/WebSC.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.9.066.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.066.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.0.067.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.067.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
VersGen/bin/Debug/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/bin/Release/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/obj/Debug/TempPE/WebSC.cs.dll
BIN
View File
Binary file not shown.
VersGen/obj/Debug/VersGen.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
VersGen/obj/Debug/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/obj/Release/TempPE/WebSC.cs.dll
BIN
View File
Binary file not shown.
VersGen/obj/Release/VersGen.dll
BIN
View File
Binary file not shown.
WebSCR/WebUserControls/mod_filtroPeriodo.ascx
+1 -3
View File
@@ -3,10 +3,8 @@
<div id="divDisponib" runat="server">
<div class="ui-grid-a ui-mini">
<div class="ui-block-a">
<div class="ui-grid-a">
<div class="ui-grid-solo">
<div class="ui-block-a">
</div>
<div class="ui-block-b">
<asp:TextBox runat="server" ID="txtDataFrom" type="date" OnTextChanged="txtDataFrom_TextChanged" AutoPostBack="True" />
</div>
</div>
WebSCR/WebUserControls/mod_filtroZona.ascx
+12 -12
View File
@@ -1,20 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_filtroZona.ascx.cs" Inherits="WebSCR.WebUserControls.mod_filtroZona" %>
<div class="ui-grid-solo">
<div class="flLeft" style="width: 25%;">
<div class="ui-grid-b">
<div class="ui-block-a">
<asp:Label runat="server" ID="lblCliente" Font-Size="1.2em" />
</div>
<div class="flRight" style="width: 25%;">
<b>
<asp:Label runat="server" ID="lblZona" Font-Size="1.3em" /></b>
<br />
<asp:Label runat="server" ID="lblIndirizzo" />
</div>
<div style="text-align:center; margin: auto; width: 49%;">
<div class="flLeft" style="font-size: 0.80em; width: 80%;">
<div class="ui-block-b" style="text-align:center; margin: auto;">
<div class="flLeft" style="font-size: 0.80em; width: 60%;">
<asp:TextBox runat="server" ID="txtCerca" placeholder="Ricerca OC/DC" AutoPostBack="true" OnTextChanged="txtCerca_TextChanged" />
<asp:RequiredFieldValidator runat="server" ID="rfvDoc" ControlToValidate="txtCerca" ErrorMessage="!!!" ForeColor="Red" />
</div>
<div class="flLeft" style="font-size: 0.80em; width: 20%;">
<asp:DropDownList runat="server" ID="ddlAnno" DataSourceID="odsAnno" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlAnno_SelectedIndexChanged"></asp:DropDownList>
<div class="flLeft" style="font-size: 0.80em; width: 40%;">
<asp:DropDownList runat="server" ID="ddlAnno" DataSourceID="odsAnno" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlAnno_SelectedIndexChanged" Font-Size="0.9em"></asp:DropDownList>
<asp:ObjectDataSource ID="odsAnno" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getValidDesc" TypeName="WebSCR_data.DS_UtilityTableAdapters.ListValuesTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="*" Name="TableName" Type="String" />
@@ -23,4 +18,9 @@
</asp:ObjectDataSource>
</div>
</div>
<div class="ui-block-c">
<b><asp:Label runat="server" ID="lblZona" Font-Size="1.3em" /></b>
<br />
<asp:Label runat="server" ID="lblIndirizzo" />
</div>
</div>
WebSCR/WebUserControls/mod_filtroZona.ascx.cs
+21 -14
View File
@@ -28,20 +28,27 @@ namespace WebSCR.WebUserControls
{
if (!Page.IsPostBack)
{
if (memLayer.ML.isInSessionObject("currDoc"))
{
txtCerca.Text = memLayer.ML.StringSessionObj("currDoc");
ddlAnno.DataBind();
// salvo anno..
memLayer.ML.setSessionVal("yearSel", ddlAnno.SelectedValue);
refreshSearch();
}
else
{
lblCliente.Text = "";
lblIndirizzo.Text = "";
lblZona.Text = "";
}
doUpdate();
}
}
/// <summary>
/// forza Update
/// </summary>
public void doUpdate()
{
txtCerca.Text = memLayer.ML.StringSessionObj("currDoc");
if (memLayer.ML.isInSessionObject("currDoc"))
{
ddlAnno.DataBind();
// salvo anno..
memLayer.ML.setSessionVal("yearSel", ddlAnno.SelectedValue);
refreshSearch();
}
else
{
lblCliente.Text = "";
lblIndirizzo.Text = "";
lblZona.Text = "";
}
}
WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs
Generated
+27 -18
View File
@@ -21,24 +21,6 @@ namespace WebSCR.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCliente;
/// <summary>
/// lblZona 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 lblZona;
/// <summary>
/// lblIndirizzo 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 lblIndirizzo;
/// <summary>
/// txtCerca control.
/// </summary>
@@ -48,6 +30,15 @@ namespace WebSCR.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtCerca;
/// <summary>
/// rfvDoc 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.RequiredFieldValidator rfvDoc;
/// <summary>
/// ddlAnno control.
/// </summary>
@@ -65,5 +56,23 @@ namespace WebSCR.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsAnno;
/// <summary>
/// lblZona 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 lblZona;
/// <summary>
/// lblIndirizzo 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 lblIndirizzo;
}
}
WebSCR/WebUserControls/mod_giornata.ascx
-1
View File
@@ -13,7 +13,6 @@
<asp:Label runat="server" ID="lblCodCli" Visible="false" />
<asp:Label runat="server" ID="lblData" Visible="false" />
<div class="ui-grid-solo ui-mini" style="margin: -2px -2px;">
<DayPilot:DayPilotCalendar ID="DayPilotCalendar1" runat="server"
DataSourceID="ods"
WebSCR/WebUserControls/mod_giornata.ascx.cs
+46 -10
View File
@@ -107,6 +107,17 @@ namespace WebSCR.WebUserControls
}
}
/// <summary>
/// anno selezionato
/// </summary>
public string errMessGiorn
{
set
{
memLayer.ML.setSessionVal("errMessGiorn", value);
}
}
/// <summary>
/// evento selezione periodo inizio
/// </summary>
/// <param name="sender"></param>
@@ -116,18 +127,43 @@ namespace WebSCR.WebUserControls
// se ho 1 sola squadra selezionata...
//if(rblSquadre.SelectedIndex >= 0)
//if (mod_selSquadre.selected.Count == 1)
// verifico di avere la squadra selezionata...
if (memLayer.ML.StringSessionObj("elencoSquadre").Length > 0)
{
// recupero OC se in sessione...
string doc = memLayer.ML.StringSessionObj("currDoc");
if (doc == "") doc = "OC00000000";
// prendo la squadra selezionata
//string squadra = mod_selSquadre.selected[0].ToString();
string squadra = memLayer.ML.StringSessionObj("elencoSquadre").Split(',')[0].ToString();
// selezionato periodo, salvo evento inizio...
DtProxy.man.taImp.insertQuery(e.Start, "INDIC", squadra, doc, yearSel);
// consumo il doc selezionato e quindi rimuovo da sessione...
memLayer.ML.emptySessionVal("currDoc");
// verifico di avere MatrOP selezionata
if (memLayer.ML.isInSessionObject("matrOp"))
{
// verifico di avere DOC selezionato...
if (memLayer.ML.StringSessionObj("currDoc").Length > 0)
{
// recupero OC se in sessione...
string doc = memLayer.ML.StringSessionObj("currDoc");
// tolto doc default a zero...
//if (doc == "") doc = "OC00000000";
// prendo la squadra selezionata
//string squadra = mod_selSquadre.selected[0].ToString();
string squadra = memLayer.ML.StringSessionObj("elencoSquadre").Split(',')[0].ToString();
// selezionato periodo, salvo evento inizio...
DtProxy.man.taImp.insertQuery(e.Start, "INDIC", squadra, doc, yearSel);
// consumo il doc selezionato e quindi rimuovo da sessione...
memLayer.ML.emptySessionVal("currDoc");
// rimuovo matrOp
memLayer.ML.emptySessionVal("matrOp");
}
else
{
errMessGiorn = "Prego indicare coducmento OC/DC per procedere";
}
}
else
{
errMessGiorn = "Prego indicare Matricola Operatore per procedere";
}
}
else
{
errMessGiorn = "Prego selezionare UNA squadra per procedere";
}
doUpdate();
}
WebSCR/WebUserControls/mod_impegno.ascx
+1 -1
View File
@@ -234,7 +234,7 @@
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsImpegni" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.ImpegniTableAdapter" UpdateMethod="updateQuery" OnUpdating="odsImpegni_Updating" DeleteMethod="deleteQuery">
<asp:ObjectDataSource ID="odsImpegni" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.ImpegniTableAdapter" UpdateMethod="updateQuery" OnUpdating="odsImpegni_Updating" DeleteMethod="deleteQuery" OnDeleted="odsImpegni_Deleted">
<SelectParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
</SelectParameters>
WebSCR/WebUserControls/mod_impegno.ascx.cs
+5
View File
@@ -73,5 +73,10 @@ namespace WebSCR.WebUserControls
e.InputParameters["NoteGen"] = "";
}
}
protected void odsImpegni_Deleted(object sender, ObjectDataSourceStatusEventArgs e)
{
Response.Redirect(SteamWare.devicesAuthProxy.pagCorrente);
}
}
}
WebSCR/WebUserControls/mod_pianificazione.ascx
+9 -7
View File
@@ -11,22 +11,24 @@
<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %>
<%@ Register Src="~/WebUserControls/mod_compSquadra.ascx" TagPrefix="uc1" TagName="mod_compSquadra" %>
<div class="ui-grid-a ui-mini noShadows">
<div class="ui-grid-b ui-mini noShadows">
<div class="ui-block-a ui-corner-all" style="text-align: center; margin: auto; font-size: 0.9em; border: 1px solid #CDCDCD; min-height: 80px; background-color: #EAEAFF;">
<div class="tStrong">Ricerca per Documento</div>
<uc1:mod_filtroZona runat="server" ID="mod_filtroZona" />
</div>
<div class="ui-block-b ui-corner-all" style="text-align: center; margin: auto; font-size: 0.9em; border: 1px solid #CDCDCD; min-height: 80px; background-color: #EAEAFF;">
<div class="tStrong">Matr. Operatore</div>
<div style="width: 80%; margin: auto;">
<asp:TextBox runat="server" ID="txtMatrOp" AutoPostBack="true" OnTextChanged="txtMatrOp_TextChanged" />
<asp:RequiredFieldValidator runat="server" ID="rfvDoc" ControlToValidate="txtMatrOp" ErrorMessage="!!!" ForeColor="Red" />
</div>
</div>
<div class="ui-block-c ui-corner-all" style="text-align: center; margin: auto; font-size: 0.9em; border: 1px solid #CDCDCD; min-height: 80px; background-color: #EAEAFF;">
<div class="tStrong">Ricerca per Periodo</div>
<uc1:mod_filtroPeriodo runat="server" ID="mod_filtroPeriodo" />
</div>
</div>
<div class="ui-mini" style="width: 100%; margin: -2px -4px; text-align: center; margin: auto;">
<div class="ui-mini" style="width: 100%; margin: -2px -4px; text-align: center;">
<div style="width: 90%; float: left; text-align: center; margin: auto;">
<uc1:mod_selSquadre runat="server" ID="mod_selSquadre" />
</div>
WebSCR/WebUserControls/mod_pianificazione.ascx.cs
+53
View File
@@ -132,6 +132,17 @@ namespace WebSCR.WebUserControls
memLayer.ML.setSessionVal("DataImp", DataImp);
}
/// <summary>
/// anno selezionato
/// </summary>
public string errMessGiorn
{
get
{
return memLayer.ML.StringSessionObj("errMessGiorn");
}
}
/// <summary>
/// nuovo record impegno...
/// </summary>
@@ -176,6 +187,16 @@ namespace WebSCR.WebUserControls
mod_dispPeriodo.doUpdate();
mod_impegno.doUpdate();
mod_dettInt.doUpdate();
// se è vuoto doc resetto...
if (!memLayer.ML.isInSessionObject("currDoc"))
{
mod_filtroZona.doUpdate();
}
// update matrOp...
txtMatrOp.Text = memLayer.ML.StringSessionObj("matrOp");
txtMatrOp.DataBind();
}
protected void lbLess_Click(object sender, EventArgs e)
@@ -199,5 +220,37 @@ namespace WebSCR.WebUserControls
Response.Redirect(devicesAuthProxy.pagCorrente);
}
}
/// <summary>
/// inserita matricola operatore
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtMatrOp_TextChanged(object sender, EventArgs e)
{
if (txtMatrOp.Text.Trim() != "")
{
memLayer.ML.setSessionVal("matrOp", txtMatrOp.Text.Trim());
}
else
{
memLayer.ML.emptySessionVal("matrOp");
}
}
#if false
/// <summary>
/// matricola oepratore selezionata
/// </summary>
protected string matrOp
{
get
{
return memLayer.ML.StringSessionObj("matrOp");
}
set
{
memLayer.ML.setSessionVal("matrOp", value);
}
}
#endif
}
}
WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
Generated
+18
View File
@@ -21,6 +21,24 @@ namespace WebSCR.WebUserControls {
/// </remarks>
protected global::WebSCR.WebUserControls.mod_filtroZona mod_filtroZona;
/// <summary>
/// txtMatrOp 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.TextBox txtMatrOp;
/// <summary>
/// rfvDoc 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.RequiredFieldValidator rfvDoc;
/// <summary>
/// mod_filtroPeriodo control.
/// </summary>
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/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/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.