altro avanzamento x selezione pianificazione impegni

This commit is contained in:
Samuele E. Locatelli
2015-04-28 18:22:23 +02:00
parent feabd9fcc0
commit a148958e09
25 changed files with 432 additions and 33 deletions
BIN
View File
Binary file not shown.
+20
View File
@@ -0,0 +1,20 @@
.greenBox {
background-color: #c3ffc3;
border: 1px solid #00a400;
color: #333333;
}
.orangeBox {
background-color: #ffa05b;
border: 1px solid #be5100;
color: #333333;
}
.redBox {
background-color: #ff9c9c;
border: 1px solid #cb0000;
color: #333333;
}
.grayBox {
background-color: #d6d6d6;
border: 1px solid #707070;
color: #333333;
}
+44
View File
@@ -1,2 +1,46 @@
body {
}
@rosso: #FF0000;
@rossoChiaro: #ff9c9c;
@rossoScuro: #cb0000;
@verde: #00FF00;
@verdeChiaro: #c3ffc3;
@verdeScuro: #00a400;
@arancio: #ff6a00;
@arancioChiaro: #ffa05b;
@arancioScuro: #be5100;
@grigio: #ACACAC;
@grigioChiaro: #d6d6d6;
@grigioScuro: #707070;
@testoScuro: #333;
.greenBox{
background-color: @verdeChiaro;
border: 1px solid @verdeScuro;
color: @testoScuro;
}
.orangeBox{
background-color: @arancioChiaro;
border: 1px solid @arancioScuro;
color: @testoScuro;
}
.redBox{
background-color: @rossoChiaro;
border: 1px solid @rossoScuro;
color: @testoScuro;
}
.grayBox{
background-color: @grigioChiaro;
border: 1px solid @grigioScuro;
color: @testoScuro;
}
+1
View File
@@ -0,0 +1 @@
.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333}
+6
View File
@@ -318,6 +318,12 @@
<Content Include="Content\jquery.mobile.structure-1.4.5.min.css" />
<Content Include="Content\jquery.mobile.theme-1.4.5.css" />
<Content Include="Content\jquery.mobile.theme-1.4.5.min.css" />
<Content Include="Content\WebSCR.css">
<DependentUpon>WebSCR.less</DependentUpon>
</Content>
<Content Include="Content\WebSCR.min.css">
<DependentUpon>WebSCR.less</DependentUpon>
</Content>
<Content Include="Default.aspx" />
<Content Include="Dettaglio.aspx" />
<Content Include="Interventi.aspx" />
@@ -16,4 +16,4 @@ Permetto di inserire uno o + task
<br />
selettore testuale x ADD
<br />
elenco task inseriti (gridview)
elenco task inseriti (gridview) che aggiornano i totali del tempi impegni (togliere da colonna fisica e fare solo calcolata?)
@@ -33,6 +33,8 @@ namespace WebSCR.WebUserControls
/// <param name="e"></param>
void mod_selettoreIndirizzo1_eh_selIndir(object sender, EventArgs e)
{
// imposto zona...
mod_selettoreSlot1.zona = mod_selettoreIndirizzo1.selAddr.zona;
mod_selettoreSlot1.Visible = true;
}
@@ -78,6 +78,7 @@ namespace WebSCR.WebUserControls
newAdd.cap = 12345;
newAdd.localita = "localita 12345";
newAdd.prov = "BG";
newAdd.zona = 5;
selAddr = newAdd;
fixBtnMode("btn01");
}
@@ -89,6 +90,7 @@ namespace WebSCR.WebUserControls
newAdd.cap = 12345;
newAdd.localita = "localita 12345";
newAdd.prov = "BG";
newAdd.zona = 10;
selAddr = newAdd;
fixBtnMode("btn02");
}
@@ -100,6 +102,7 @@ namespace WebSCR.WebUserControls
newAdd.cap = 12345;
newAdd.localita = "localita 12345";
newAdd.prov = "BG";
newAdd.zona = 20;
selAddr = newAdd;
fixBtnMode("btn03");
}
@@ -111,6 +114,7 @@ namespace WebSCR.WebUserControls
newAdd.cap = 12345;
newAdd.localita = "localita 12345";
newAdd.prov = "BG";
newAdd.zona = 30;
selAddr = newAdd;
fixBtnMode("btn04");
}
@@ -123,5 +127,6 @@ namespace WebSCR.WebUserControls
public int cap { get; set; }
public string localita { get; set; }
public string prov { get; set; }
public int zona { get; set; }
}
}
+16 -12
View File
@@ -30,36 +30,40 @@
</div>
</div>
<div class="ui-block-c">
<div class="ui-grid-a">
<div class="ui-block-a">
zona consegna
<br />
<b>
<asp:Label runat="server" ID="lblZona" /></b>
</div>
<div class="ui-block-b">
</div>
</div>
</div>
</div>
seleziono quale slot, gli slot sono
<ul>
<li>Colorati x vicinanza a zona indirizzo (oppure icona mappa colorata?)</li>
<li>Colorati x tempo disponibile (oppure icona tempo colorata) + indicazione ore imp/disponibili</li>
</ul>
<li>Colorati x tempo disponibile (oppure icona tempo colorata) + indicazione ore imp/disponibili / % impegnato</li>
</ul>
<div class="ui-grid-a ui-mini">
<div class="ui-block-a">
<div class="ui-grid-d">
<asp:Repeater ID="repSlot" runat="server" DataSourceID="odsSlot">
<ItemTemplate>
<div style="float: left; padding:4px;">
<%#Eval("Data","{0:dd/MM/yyyy}") %>
<div class='<%# frameFromDispZona(Eval("DistMed"), Eval("OreImp"), Eval("OreDisp")) %>' style="float: left; margin: 2px; padding: 4px; height: 60px; width: 80px;">
<%#Eval("Data","{0:ddd dd/MM/yy}") %>
<br />
<%#Eval("OreImp") %> / <b><%#Eval("OreDisp") %></b>
<%# string.Format("{0:P0}",Convert.ToDouble(Eval("OreImp"))/ Convert.ToDouble(Eval("OreDisp"))) %>
</div>
</ItemTemplate>
<AlternatingItemTemplate>
<div style="float: left; padding:4px;">
<%#Eval("Data","{0:dd/MM/yyyy}") %>
<br />
<%#Eval("OreImp") %> / <b><%#Eval("OreDisp") %></b>
</div>
</AlternatingItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="odsSlot" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDataRange" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.DispImpTotTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="txtDataFrom" Name="DataFrom" PropertyName="Text" Type="DateTime" />
<asp:ControlParameter ControlID="txtNumGG" DefaultValue="1" Name="NumGG" PropertyName="Text" Type="Int32" />
<asp:ControlParameter ControlID="lblZona" DefaultValue="0" Name="Zona" PropertyName="Text" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
@@ -33,6 +33,18 @@ namespace WebSCR.WebUserControls
}
}
/// <summary>
/// numero giorni selezionati
/// </summary>
public int zona
{
set
{
int newVal = 0;
if (value >= newVal) newVal = value;
lblZona.Text = newVal.ToString();
}
}
/// <summary>
/// data riferimento
/// </summary>
protected DateTime dataFrom
@@ -88,5 +100,31 @@ namespace WebSCR.WebUserControls
{
repSlot.DataBind();
}
/// <summary>
/// restituisce il codice css x il frame data zona, ore disp, ore impegnate
/// </summary>
/// <param name="_dist"></param>
/// <param name="_oreImp"></param>
/// <param name="_oreDisp"></param>
/// <returns></returns>
public string frameFromDispZona(object _dist, object _oreImp, object _oreDisp)
{
string answ = "";
double oreImp = Convert.ToDouble(_oreImp);
double oreDisp = Convert.ToDouble(_oreDisp);
if (oreImp < oreDisp/2)
{
answ = "greenBox";
}
else if (oreImp < oreDisp / 4)
{
answ = "orangeBox";
}
else
{
answ = "redBox";
}
return answ;
}
}
}
@@ -75,6 +75,15 @@ namespace WebSCR.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbPlus5;
/// <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>
/// repSlot control.
/// </summary>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+232 -9
View File
@@ -2032,6 +2032,18 @@ namespace WebSCR_data {
private global::System.Data.DataColumn columnUrlDoc;
private global::System.Data.DataColumn columnIndir;
private global::System.Data.DataColumn columnCap;
private global::System.Data.DataColumn columnLocalita;
private global::System.Data.DataColumn columnProv;
private global::System.Data.DataColumn columnZona;
private global::System.Data.DataColumn columnNoteGen;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public ImpegniDataTable() {
@@ -2209,6 +2221,54 @@ 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 IndirColumn {
get {
return this.columnIndir;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn CapColumn {
get {
return this.columnCap;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn LocalitaColumn {
get {
return this.columnLocalita;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn ProvColumn {
get {
return this.columnProv;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn ZonaColumn {
get {
return this.columnZona;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn NoteGenColumn {
get {
return this.columnNoteGen;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2264,7 +2324,13 @@ namespace WebSCR_data {
string CodFis,
bool OraIndic,
string RifOC,
string UrlDoc) {
string UrlDoc,
string Indir,
string Cap,
string Localita,
string Prov,
int Zona,
string NoteGen) {
ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
IdxImpegno,
@@ -2284,7 +2350,13 @@ namespace WebSCR_data {
CodFis,
OraIndic,
RifOC,
UrlDoc};
UrlDoc,
Indir,
Cap,
Localita,
Prov,
Zona,
NoteGen};
rowImpegniRow.ItemArray = columnValuesArray;
this.Rows.Add(rowImpegniRow);
return rowImpegniRow;
@@ -2334,6 +2406,12 @@ namespace WebSCR_data {
this.columnOraIndic = base.Columns["OraIndic"];
this.columnRifOC = base.Columns["RifOC"];
this.columnUrlDoc = base.Columns["UrlDoc"];
this.columnIndir = base.Columns["Indir"];
this.columnCap = base.Columns["Cap"];
this.columnLocalita = base.Columns["Localita"];
this.columnProv = base.Columns["Prov"];
this.columnZona = base.Columns["Zona"];
this.columnNoteGen = base.Columns["NoteGen"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2375,6 +2453,18 @@ namespace WebSCR_data {
base.Columns.Add(this.columnRifOC);
this.columnUrlDoc = new global::System.Data.DataColumn("UrlDoc", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUrlDoc);
this.columnIndir = new global::System.Data.DataColumn("Indir", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnIndir);
this.columnCap = new global::System.Data.DataColumn("Cap", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCap);
this.columnLocalita = new global::System.Data.DataColumn("Localita", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnLocalita);
this.columnProv = new global::System.Data.DataColumn("Prov", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnProv);
this.columnZona = new global::System.Data.DataColumn("Zona", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnZona);
this.columnNoteGen = new global::System.Data.DataColumn("NoteGen", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnNoteGen);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnIdxImpegno,
this.columnCodSquadra,
@@ -2402,6 +2492,18 @@ namespace WebSCR_data {
this.columnRifOC.MaxLength = 50;
this.columnUrlDoc.AllowDBNull = false;
this.columnUrlDoc.MaxLength = 2147483647;
this.columnIndir.AllowDBNull = false;
this.columnIndir.MaxLength = 50;
this.columnCap.AllowDBNull = false;
this.columnCap.MaxLength = 10;
this.columnLocalita.AllowDBNull = false;
this.columnLocalita.MaxLength = 50;
this.columnProv.AllowDBNull = false;
this.columnProv.MaxLength = 2;
this.columnZona.AllowDBNull = false;
this.columnZona.Caption = "idxZona";
this.columnNoteGen.AllowDBNull = false;
this.columnNoteGen.MaxLength = 250;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2541,6 +2643,8 @@ namespace WebSCR_data {
private global::System.Data.DataColumn columnOreImp;
private global::System.Data.DataColumn columnDistMed;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public DispImpTotDataTable() {
@@ -2598,6 +2702,14 @@ 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 DistMedColumn {
get {
return this.columnDistMed;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2635,12 +2747,13 @@ namespace WebSCR_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public DispImpTotRow AddDispImpTotRow(System.DateTime Data, int OreDisp, int OreImp) {
public DispImpTotRow AddDispImpTotRow(System.DateTime Data, int OreDisp, int OreImp, int DistMed) {
DispImpTotRow rowDispImpTotRow = ((DispImpTotRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
Data,
OreDisp,
OreImp};
OreImp,
DistMed};
rowDispImpTotRow.ItemArray = columnValuesArray;
this.Rows.Add(rowDispImpTotRow);
return rowDispImpTotRow;
@@ -2666,6 +2779,7 @@ namespace WebSCR_data {
this.columnData = base.Columns["Data"];
this.columnOreDisp = base.Columns["OreDisp"];
this.columnOreImp = base.Columns["OreImp"];
this.columnDistMed = base.Columns["DistMed"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2677,7 +2791,10 @@ namespace WebSCR_data {
base.Columns.Add(this.columnOreDisp);
this.columnOreImp = new global::System.Data.DataColumn("OreImp", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnOreImp);
this.columnDistMed = new global::System.Data.DataColumn("DistMed", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDistMed);
this.columnData.AllowDBNull = false;
this.columnDistMed.ReadOnly = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -4081,6 +4198,72 @@ namespace WebSCR_data {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string Indir {
get {
return ((string)(this[this.tableImpegni.IndirColumn]));
}
set {
this[this.tableImpegni.IndirColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string Cap {
get {
return ((string)(this[this.tableImpegni.CapColumn]));
}
set {
this[this.tableImpegni.CapColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string Localita {
get {
return ((string)(this[this.tableImpegni.LocalitaColumn]));
}
set {
this[this.tableImpegni.LocalitaColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string Prov {
get {
return ((string)(this[this.tableImpegni.ProvColumn]));
}
set {
this[this.tableImpegni.ProvColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public int Zona {
get {
return ((int)(this[this.tableImpegni.ZonaColumn]));
}
set {
this[this.tableImpegni.ZonaColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public string NoteGen {
get {
return ((string)(this[this.tableImpegni.NoteGenColumn]));
}
set {
this[this.tableImpegni.NoteGenColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsFinePrevNull() {
@@ -4187,6 +4370,22 @@ namespace WebSCR_data {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public int DistMed {
get {
try {
return ((int)(this[this.tableDispImpTot.DistMedColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'DistMed\' in table \'DispImpTot\' is DBNull.", e);
}
}
set {
this[this.tableDispImpTot.DistMedColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsOreDispNull() {
@@ -4210,6 +4409,18 @@ namespace WebSCR_data {
public void SetOreImpNull() {
this[this.tableDispImpTot.OreImpColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsDistMedNull() {
return this.IsNull(this.tableDispImpTot.DistMedColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public void SetDistMedNull() {
this[this.tableDispImpTot.DistMedColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -7340,6 +7551,12 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
tableMapping.ColumnMappings.Add("RifOC", "RifOC");
tableMapping.ColumnMappings.Add("UrlDoc", "UrlDoc");
tableMapping.ColumnMappings.Add("NumOp", "NumOp");
tableMapping.ColumnMappings.Add("Indir", "Indir");
tableMapping.ColumnMappings.Add("Cap", "Cap");
tableMapping.ColumnMappings.Add("Localita", "Localita");
tableMapping.ColumnMappings.Add("Prov", "Prov");
tableMapping.ColumnMappings.Add("idxZona", "Zona");
tableMapping.ColumnMappings.Add("NoteGen", "NoteGen");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -7356,9 +7573,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT IdxImpegno, DataOra, CodSquadra, DescrSquadra, Elettrod, Clima, Inf" +
"orm, MinTotCons, MinViaggio, FinePrev, NumOp, CodCliente, Cognome, Nome, CodFis," +
" OraIndic, RifOC, UrlDoc\r\nFROM v_elencoImpegni";
this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_elencoImpegni";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
@@ -7557,6 +7772,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
tableMapping.ColumnMappings.Add("Data", "Data");
tableMapping.ColumnMappings.Add("OreDisp", "OreDisp");
tableMapping.ColumnMappings.Add("OreImp", "OreImp");
tableMapping.ColumnMappings.Add("DistMed", "DistMed");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -7573,7 +7789,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT Data, OreDisp, OreImp FROM dbo.v_DispImpTot";
this._commandCollection[0].CommandText = "SELECT * FROM dbo.v_DispImpTot";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
@@ -7582,6 +7798,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumGG", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -7612,7 +7829,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_Applicazione.DispImpTotDataTable getByDataRange(global::System.Nullable<global::System.DateTime> DataFrom, global::System.Nullable<int> NumGG) {
public virtual DS_Applicazione.DispImpTotDataTable getByDataRange(global::System.Nullable<global::System.DateTime> DataFrom, global::System.Nullable<int> NumGG, global::System.Nullable<int> Zona) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((DataFrom.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(DataFrom.Value));
@@ -7626,6 +7843,12 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
else {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
if ((Zona.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(Zona.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
DS_Applicazione.DispImpTotDataTable dataTable = new DS_Applicazione.DispImpTotDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
+51 -6
View File
@@ -513,10 +513,10 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ImpegniTableAdapter" GeneratorDataComponentClassName="ImpegniTableAdapter" Name="Impegni" UserDataComponentName="ImpegniTableAdapter">
<MainSource>
<DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.v_elencoImpegni" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" 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">
<DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.v_elencoImpegni" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT IdxImpegno, DataOra, CodSquadra, DescrSquadra, Elettrod, Clima, Inform, MinTotCons, MinViaggio, FinePrev, NumOp, CodCliente, Cognome, Nome, CodFis, OraIndic, RifOC, UrlDoc
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT *
FROM v_elencoImpegni</CommandText>
<Parameters />
</DbCommand>
@@ -543,6 +543,12 @@ FROM v_elencoImpegni</CommandText>
<Mapping SourceColumn="RifOC" DataSetColumn="RifOC" />
<Mapping SourceColumn="UrlDoc" DataSetColumn="UrlDoc" />
<Mapping SourceColumn="NumOp" DataSetColumn="NumOp" />
<Mapping SourceColumn="Indir" DataSetColumn="Indir" />
<Mapping SourceColumn="Cap" DataSetColumn="Cap" />
<Mapping SourceColumn="Localita" DataSetColumn="Localita" />
<Mapping SourceColumn="Prov" DataSetColumn="Prov" />
<Mapping SourceColumn="idxZona" DataSetColumn="Zona" />
<Mapping SourceColumn="NoteGen" DataSetColumn="NoteGen" />
</Mappings>
<Sources>
<DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.stp_Imp_getByCodCli" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByCli" GetMethodModifier="Public" GetMethodName="getByCli" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByCli" UserSourceName="getByCli">
@@ -571,10 +577,10 @@ FROM v_elencoImpegni</CommandText>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="DispImpTotTableAdapter" GeneratorDataComponentClassName="DispImpTotTableAdapter" Name="DispImpTot" UserDataComponentName="DispImpTotTableAdapter">
<MainSource>
<DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.v_DispImpTot" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" 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">
<DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.v_DispImpTot" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT Data, OreDisp, OreImp FROM dbo.v_DispImpTot</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT * FROM dbo.v_DispImpTot</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
@@ -584,6 +590,7 @@ FROM v_elencoImpegni</CommandText>
<Mapping SourceColumn="Data" DataSetColumn="Data" />
<Mapping SourceColumn="OreDisp" DataSetColumn="OreDisp" />
<Mapping SourceColumn="OreImp" DataSetColumn="OreImp" />
<Mapping SourceColumn="DistMed" DataSetColumn="DistMed" />
</Mappings>
<Sources>
<DbSource ConnectionRef="WebSCRConnectionString (Settings)" DbObjectName="WebSCR.dbo.stp_DispImpTot_getByDataRange" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByDataRange" GetMethodModifier="Public" GetMethodName="getByDataRange" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByDataRange" UserSourceName="getByDataRange">
@@ -594,6 +601,7 @@ FROM v_elencoImpegni</CommandText>
<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="datetime" DbType="DateTime" Direction="Input" ParameterName="@DataFrom" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@NumGG" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Zona" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -892,6 +900,42 @@ FROM v_elencoImpegni</CommandText>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Indir" msprop:Generator_ColumnVarNameInTable="columnIndir" msprop:Generator_ColumnPropNameInRow="Indir" msprop:Generator_ColumnPropNameInTable="IndirColumn" msprop:Generator_UserColumnName="Indir">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Cap" msprop:Generator_ColumnVarNameInTable="columnCap" msprop:Generator_ColumnPropNameInRow="Cap" msprop:Generator_ColumnPropNameInTable="CapColumn" msprop:Generator_UserColumnName="Cap">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Localita" msprop:Generator_ColumnVarNameInTable="columnLocalita" msprop:Generator_ColumnPropNameInRow="Localita" msprop:Generator_ColumnPropNameInTable="LocalitaColumn" msprop:Generator_UserColumnName="Localita">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Prov" msprop:Generator_ColumnVarNameInTable="columnProv" msprop:Generator_ColumnPropNameInRow="Prov" msprop:Generator_ColumnPropNameInTable="ProvColumn" msprop:Generator_UserColumnName="Prov">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Zona" msdata:Caption="idxZona" msprop:Generator_ColumnVarNameInTable="columnZona" msprop:Generator_ColumnPropNameInRow="Zona" msprop:Generator_ColumnPropNameInTable="ZonaColumn" msprop:Generator_UserColumnName="Zona" type="xs:int" />
<xs:element name="NoteGen" msprop:Generator_ColumnVarNameInTable="columnNoteGen" msprop:Generator_ColumnPropNameInRow="NoteGen" msprop:Generator_ColumnPropNameInTable="NoteGenColumn" msprop:Generator_UserColumnName="NoteGen">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="250" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -901,6 +945,7 @@ FROM v_elencoImpegni</CommandText>
<xs:element name="Data" msprop:Generator_ColumnVarNameInTable="columnData" msprop:Generator_ColumnPropNameInRow="Data" msprop:Generator_ColumnPropNameInTable="DataColumn" msprop:Generator_UserColumnName="Data" type="xs:dateTime" />
<xs:element name="OreDisp" msprop:Generator_ColumnVarNameInTable="columnOreDisp" msprop:Generator_ColumnPropNameInRow="OreDisp" msprop:Generator_ColumnPropNameInTable="OreDispColumn" msprop:Generator_UserColumnName="OreDisp" type="xs:int" minOccurs="0" />
<xs:element name="OreImp" msprop:Generator_ColumnVarNameInTable="columnOreImp" msprop:Generator_ColumnPropNameInRow="OreImp" msprop:Generator_ColumnPropNameInTable="OreImpColumn" msprop:Generator_UserColumnName="OreImp" type="xs:int" minOccurs="0" />
<xs:element name="DistMed" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnDistMed" msprop:Generator_ColumnPropNameInRow="DistMed" msprop:Generator_ColumnPropNameInTable="DistMedColumn" msprop:Generator_UserColumnName="DistMed" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
+7 -5
View File
@@ -6,11 +6,13 @@
</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="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:AnagSquadre" ZOrder="2" X="308" Y="160" Height="248" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:AnagZone" ZOrder="5" X="556" Y="160" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagTipoConsegne" ZOrder="4" X="919" Y="164" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:AnagClienti" ZOrder="3" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
<Shape ID="DesignTable:Impegni" ZOrder="1" X="76" Y="253" Height="458" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
<Shape ID="DesignTable:AnagSquadre" ZOrder="3" X="535" Y="428" Height="248" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:AnagZone" ZOrder="7" X="556" Y="160" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagTipoConsegne" ZOrder="6" X="919" Y="164" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:AnagClienti" ZOrder="5" X="266" Y="256" Height="402" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="332" />
<Shape ID="DesignTable:Impegni" ZOrder="4" X="32" Y="190" Height="573" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="484" />
<Shape ID="DesignTable:DispImpTot" ZOrder="1" X="914" Y="472" Height="172" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:DispImpSquadre" ZOrder="2" X="893" Y="703" Height="153" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
</Shapes>
<Connectors />
</DiagramLayout>
Binary file not shown.
Binary file not shown.
Binary file not shown.