From e2d590b51eaf0512e238056ffa53bfcb66d539f2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 19 Jan 2017 16:16:30 +0100 Subject: [PATCH] Pulizia da kanban x sito principale... DONE! --- .vs/MP-Site/v14/.suo | Bin 221184 -> 232448 bytes MP-Site/DonatiPass-appSett.config | 3 +- MP-Site/WS/AutoCompletamento.asmx.cs | 26 +----------------- MP-Site/Web.config | 3 +- MP-Site/WebUserControls/mod_UI.ascx.cs | 13 ++++----- .../WebUserControls/mod_listaStatiEventi.ascx | 10 ++----- .../mod_listaStatiEventi.ascx.cs | 12 -------- MP-Site/WebUserControls/mod_menuTop.ascx.cs | 9 ------ MP-Site/WebUserControls/mod_semaforo.ascx | 2 +- MP-Site/WebUserControls/mod_semaforo.ascx.cs | 3 +- .../mod_semaforo.ascx.designer.cs | 4 +-- .../mod_sequencerStati.ascx.cs | 8 +++--- .../WebUserControls/mod_statoMacchina.ascx | 4 +-- .../WebUserControls/mod_statoMacchina.ascx.cs | 5 ++-- .../mod_statoMacchina.ascx.designer.cs | 8 +++--- .../excelAllMacchineDatiConfermati.aspx.cs | 7 +---- MP-Site/excelAllMacchineExportEventi.aspx | 3 +- MP-Site/excelAllMacchineExportEventi.aspx.cs | 6 ---- ...elAllMacchineExportEventi.aspx.designer.cs | 3 +- MP-Site/excelAllMacchineExportStati.aspx | 3 +- MP-Site/excelAllMacchineExportStati.aspx.cs | 5 ---- ...celAllMacchineExportStati.aspx.designer.cs | 3 +- MP-Site/excelExportDatiConfermati.aspx.cs | 6 ---- MP-Site/excelExportEventi.aspx | 3 +- MP-Site/excelExportEventi.aspx.cs | 6 ---- MP-Site/excelExportEventi.aspx.designer.cs | 3 +- MP-Site/excelExportStati.aspx | 3 +- MP-Site/excelExportStati.aspx.cs | 5 ---- MP-Site/excelExportStati.aspx.designer.cs | 3 +- MapoDb/utility.cs | 2 +- 30 files changed, 38 insertions(+), 133 deletions(-) diff --git a/.vs/MP-Site/v14/.suo b/.vs/MP-Site/v14/.suo index b6e985d4f587aeb01d20b9b6b477b7bf26a4c276..86bd93381b5c10e6e3b031f9182e096cc83bb13a 100644 GIT binary patch delta 13079 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 delta 4765 zcmeGfe^8Xy@q6#Var`)b$uAM{L_!c0?+`>0^?(x;HJpNsKZxNFj36q?!6-(9nph`E zTkf8^wv9hPtHz`m^_qU|Ok!?Eo5`e8BE~io$FbHrPHQKoHP{**rMus8dc;JXw&`Ep zo4vQ+?!Mi(`*z>=zK-4D9UenxfiYZB6oGiJzrP;`jW*$!fjAWLxP2dUHV3-+Y?dKM z@)6q)VCn zD0PuLH87oFNWI)>`0}snpon_(lo3?#m%W9lT6h)u0Dsm2c{6BKT_mz}18mYJAa6d^ zFr@kS(h!iL3Z^c;NM)c(&bbwE?1f-qz)NhT9bRLdOrUqUxFf>Ub4W0H; z!3Jc6BSyIYJ}&}y^p~y>ec&Uc;eD)2-VFalPeG6)N`Kb`>Il>(Mrb%rvm4QEd#O&w+Hr*re5H(p8c`$lEcfL?uM2_9?M$*&16;YV4rA z8Nb0mVeCbPeTe(z$kZXSvuL@zl~5T#5@{Ryr98#W(vhgymVJrm^pskkJ=r(xg~!`C z<}wx=ln9*X+fHxPDPbav+|;5(bN5=H!S4?dTPOK0akg-lwMXw#VvZc1Qp{Z_Mw#h{H6(~H% zQ%2g>u5PYh>u9KNskUvIw11y&_Q#0}1N>o;m<7w)#3C4Xgonbb z>qIVGD&y0mY!7Gg2-C9Goz72GT3Hw!HE9Fu_vU6kW{ldI+TIsY=ox(Y2O@&Ie>8j4 zT-rbXxq;eT_g7PbxGUcpMyCj!&_2^_scg;fk*9L7(wBbhE-naUdfzGQE!FyR=00Va z!l3pRcYI^!>d~H}D_GUq)HIdI|2%Wd=Cp5jZ!cQMjI_{~{0i@7q_-h{4{y zJCUF^Iw)tRVD&OF7XkL?ekKWP5IzJe^+BwU9~gx)M!ML6K!KY(fdw(Z*fevX(uSX+I)IiL;n*Q1l?u)L|qD( zDTygsQ<4&aclNiOWV%~8GmW`#*RSQWDIvlA((=fR;DR}dQdU$^yi7W~+|ni!b^41b znI#3XS)LD?m>(SyW$cl2cl=47yEj3ac!0b*dtEHOO;;CzPB?Id&WO7t5T04wkpq~+jw{4uChS3l01agp`cl5!VIjZXw++2ERM_e zJ#XD#(TV-n`F)>Ft7OWoc6WPoV#@!s{hepqC1vwZPD{(Haffs~ivNhKJf835(-eiy zENnszVhP;YdEA$VdwuRD|+2fnv3mNq~s~ZN{KQ_F=L>4 z$eD!yW0f4msuU^{kt$TiE4fNGQYFZpgxaKKM!prFrYj{7HHwdh*_jw*G1@ajZyX;7 z9(;!7m7*=S06U-=v$qNlN$;y)uUrS`cJ78%y*vu0X7fz=bQk|UbUFDxh}?n6TiMI= z!910pg)SyOQ@8Er)q`{!e)gG+*Z>J1>eL=-6i za)+lwQ3g+djyt>q-mDfYV8s#<%Q97Vmw(QnE<{{pXW)-R#2YX%M2ulQUb-$AuPsHP z;u1Rxy)nWKp09W+So6d=_<4*-f`GfcQJoksj9fjJD8d+A9xj^TbfSnqTIcof@<#Lr;)Y*7S7<)RUe z&JrhoQ7*P|sGKJ*kY`3BDiNn1T_D0a^wfwO@IkvshKq|tH*{q1>e30y z1gxfP%$ynPZ93N5c&xNstp;;&^zsUEq?Kf!+mt8X21mw-*T$G`3@Ee_-V$bZ;Jfd1{2?Gq5bWB;Pu? zE!M#1-|!sxezkZFJaxhXL!ZSzOTF;ueb-i~v5T7fiOyF&ZNkDJiivF1wwt@2przsi z!CAo0drR}W(TN#_H z@Gz#z*!8UNP!)LCckqG3Z1DbJ9tRg|#5Op(SfqNLJFB=E`j?6bZ3PfsCx(8#wa(1o YI`6W;*)Gbzp~3v)dTg^C+924!06Hj9XaE2J diff --git a/MP-Site/DonatiPass-appSett.config b/MP-Site/DonatiPass-appSett.config index 9bcc9ab2..76dd0ab3 100644 --- a/MP-Site/DonatiPass-appSett.config +++ b/MP-Site/DonatiPass-appSett.config @@ -20,7 +20,6 @@ - @@ -36,7 +35,7 @@ - + diff --git a/MP-Site/WS/AutoCompletamento.asmx.cs b/MP-Site/WS/AutoCompletamento.asmx.cs index c64f2bc1..9bac2052 100644 --- a/MP-Site/WS/AutoCompletamento.asmx.cs +++ b/MP-Site/WS/AutoCompletamento.asmx.cs @@ -40,30 +40,6 @@ namespace MoonPro.WS } return suggerimenti.ToArray(); } - - - /// - /// elenco dei kanban per ricerca interattiva - /// - /// - [WebMethod(Description = "elenco dei kanban per ricerca interattiva")] - public string[] elencoKanban(string prefixText, int count) - { - // inizializzo risposta - List suggerimenti = new List(); - // proseguo SOLO SE min "MinCharAutocomplete" char... - if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) - { - // elenco candidati - MapoDb.DS_Utility.v_selKanbanDataTable tabDati = MapoDb.DataLayer.obj.taSelKan.getByConditio(prefixText); - // aggiungo ogni riga... - foreach (MapoDb.DS_Utility.v_selKanbanRow riga in tabDati) - { - suggerimenti.Add(riga.value); - } - } - return suggerimenti.ToArray(); - } - + } } diff --git a/MP-Site/Web.config b/MP-Site/Web.config index 5fdc4bea..0b52adc8 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -30,7 +30,6 @@ - @@ -40,7 +39,7 @@ - + diff --git a/MP-Site/WebUserControls/mod_UI.ascx.cs b/MP-Site/WebUserControls/mod_UI.ascx.cs index 5c218beb..8ed47485 100644 --- a/MP-Site/WebUserControls/mod_UI.ascx.cs +++ b/MP-Site/WebUserControls/mod_UI.ascx.cs @@ -294,7 +294,7 @@ namespace MoonPro.WebUserControls string prefDichProd = memLayer.ML.confReadString("prefDichProd"); string prefDichFerm = memLayer.ML.confReadString("prefDichFerm"); string prefDichOp = memLayer.ML.confReadString("prefDichOp"); - string prefDichKanban = memLayer.ML.confReadString("prefDichKanban"); + string prefDichCodArt = memLayer.ML.confReadString("prefDichCodArt"); string prefDichAttrezzaggio = memLayer.ML.confReadString("prefDichAttrezzaggio"); string prefModTurno = memLayer.ML.confReadString("prefModTurno"); _tipoBCode = tipoBarcode.nd; @@ -312,9 +312,9 @@ namespace MoonPro.WebUserControls { _tipoBCode = tipoBarcode.matrOperatore; } - else if (prefBarcode == prefDichKanban) + else if (prefBarcode == prefDichCodArt) { - _tipoBCode = tipoBarcode.kanban; + _tipoBCode = tipoBarcode.codArticolo; } else if (prefBarcode == prefDichAttrezzaggio) { @@ -346,7 +346,7 @@ namespace MoonPro.WebUserControls case tipoBarcode.matrOperatore: processaCartellinoOperatore(); break; - case tipoBarcode.kanban: + case tipoBarcode.codArticolo: // x ora non serve break; case tipoBarcode.attrezzaggio: @@ -715,9 +715,8 @@ namespace MoonPro.WebUserControls DS_applicazione.StatoMacchineRow rigaStato = DataLayer.obj.taStatoMacchine.GetDataByIdxMacchina(idxMacchina)[0]; // ricavo codice articolo... string CodArticolo = DataLayer.obj.taODL.getByIdx(idxODL, false)[0].CodArticolo; - string MatrKanban = DataLayer.obj.taKanban.getByCodArt(CodArticolo)[0].MatricolaKanban; // processo evento... - controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, MatrKanban, "", rigaStato.MatrOpr, rigaStato.pallet); + controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, CodArticolo, "", rigaStato.MatrOpr, rigaStato.pallet); // ricarico a seconda del tipo di codice if (BarCode.StartsWith(StartSetup)) { @@ -763,7 +762,7 @@ namespace MoonPro.WebUserControls { DS_applicazione.StatoMacchineRow rigaStato = DataLayer.obj.taStatoMacchine.GetDataByIdxMacchina(idxMacchina)[0]; // processo evento... - controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, rigaStato.MatricolaKanban, "", rigaStato.MatrOpr, rigaStato.pallet); + controllerMapo.scriviRigaEventoBarcode(idxMacchina, idxEvento, rigaStato.CodArticolo, "", rigaStato.MatrOpr, rigaStato.pallet); // ricarico! salvaRicarica("Dichiarazione fermata", "Registrata dichiarazione fermata"); } diff --git a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx index 25b86927..c0877e3c 100644 --- a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx +++ b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx @@ -68,9 +68,7 @@ - - + @@ -138,13 +136,11 @@ - + - + - diff --git a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs index 39f81ba9..c9e9b53e 100644 --- a/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs +++ b/MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs @@ -96,18 +96,6 @@ namespace MoonPro.WebUserControls { return _resoconti.tipoDaIdx(Convert.ToInt32(idx)); } - public string kanbanDaIdx(object idx) - { - string answ = ""; - try - { - DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString()); - answ = riga.KanbanCode; - } - catch - { } - return answ; - } public void aggiornamento() { if (memLayer.ML.confReadInt("_logLevel") > 5) diff --git a/MP-Site/WebUserControls/mod_menuTop.ascx.cs b/MP-Site/WebUserControls/mod_menuTop.ascx.cs index 78ef3d73..d172caa1 100644 --- a/MP-Site/WebUserControls/mod_menuTop.ascx.cs +++ b/MP-Site/WebUserControls/mod_menuTop.ascx.cs @@ -186,15 +186,6 @@ namespace MoonPro.WebUserControls { return string.Format("{0:d} - {0:HH.mm.ss}", DateTime.Now); } - protected void lnkUpdateKanban_Click(object sender, EventArgs e) - { - Response.Redirect("./caricaUpdateKanban.aspx"); - } - protected void lnkUpdateOpr_Click(object sender, EventArgs e) - { - Response.Redirect("./caricaUpdateOperatori.aspx"); - } - protected void HiddenHeight_ValueChanged(object sender, EventArgs e) { updateWindowSize(); diff --git a/MP-Site/WebUserControls/mod_semaforo.ascx b/MP-Site/WebUserControls/mod_semaforo.ascx index c47c60cb..e369e8bd 100644 --- a/MP-Site/WebUserControls/mod_semaforo.ascx +++ b/MP-Site/WebUserControls/mod_semaforo.ascx @@ -8,7 +8,7 @@

- +
diff --git a/MP-Site/WebUserControls/mod_semaforo.ascx.cs b/MP-Site/WebUserControls/mod_semaforo.ascx.cs index f3348771..445b2d73 100644 --- a/MP-Site/WebUserControls/mod_semaforo.ascx.cs +++ b/MP-Site/WebUserControls/mod_semaforo.ascx.cs @@ -58,7 +58,7 @@ namespace MoonPro.WebUserControls lblDurata.Text = traduci("DurataStato"); // valori lblMacchina.Text = tabMacchine.FindByIdxMacchina(IdxMacchina).Nome; - lblCodKanban.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).KanbanCode; + lblCodArticolo.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).CodArticolo; int matrOper = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).MatrOpr; DS_applicazione.AnagraficaOperatoriRow rigaOper = DataLayer.obj.taOp.getByMatrOpr(matrOper)[0]; lblOper.Text = string.Format("{0} {1}", rigaOper.Cognome, rigaOper.Nome); @@ -160,7 +160,6 @@ namespace MoonPro.WebUserControls tabMacchine = MapoDb.DataLayer.obj.taMacchine.GetData(); tabStatoMacchine = MapoDb.DataLayer.obj.taStatoMacchine.GetData(); tabAnagStati = MapoDb.DataLayer.obj.taAnagStati.GetData(); - //tabKanban = taKanban.GetData(); tabKeepAlive = MapoDb.DataLayer.obj.taKeepAlive.GetData(); } diff --git a/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs b/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs index 9acd4859..2f8b6e9c 100644 --- a/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_semaforo.ascx.designer.cs @@ -31,13 +31,13 @@ namespace MoonPro.WebUserControls { protected global::System.Web.UI.WebControls.Label lblArt; /// - /// lblCodKanban control. + /// lblCodArticolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label lblCodKanban; + protected global::System.Web.UI.WebControls.Label lblCodArticolo; /// /// lblOperatore control. diff --git a/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs b/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs index daec5c0a..333156fb 100644 --- a/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs +++ b/MP-Site/WebUserControls/mod_sequencerStati.ascx.cs @@ -257,7 +257,7 @@ namespace MoonPro.WebUserControls double valV = 0.0; double valS = 0.0; DateTime _t_0 = new DateTime(9999, 1, 1); - string _mostKanban = ""; + string _mostCodArticolo = ""; int _maxVal = 0; string colore; foreach (DataLayer_generic.serieDatiRow riga in dati) @@ -270,7 +270,7 @@ namespace MoonPro.WebUserControls if (riga.valore > _maxVal) { _maxVal = Convert.ToInt32(riga.valore); - _mostKanban = riga.label; + _mostCodArticolo = riga.label; } valRigaCum = valRigaCum + riga.valore; // accumulo valori... @@ -314,12 +314,12 @@ namespace MoonPro.WebUserControls valG = 0.0; } // salvo riga dati - datiGrouped.AddserieDatiRow(valRigaCum, colore, _mostKanban, _t_0); + datiGrouped.AddserieDatiRow(valRigaCum, colore, _mostCodArticolo, _t_0); // reset dei contatori... valRigaCum = 0.0; _t_0 = new DateTime(9999, 1, 1); - _mostKanban = ""; + _mostCodArticolo = ""; _maxVal = 0; } } diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx b/MP-Site/WebUserControls/mod_statoMacchina.ascx index 3393b709..fd2a00d3 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx @@ -10,10 +10,10 @@
- +
- +
diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index 60c8d475..fdedb737 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -48,13 +48,13 @@ namespace MoonPro.WebUserControls if (_IdxMacchina != "nd") { // labels - lblCodKanban.Text = "Articolo"; // era kanban + lblCodArticolo.Text = "Articolo"; lblStato.Text = "Stato"; lblProd.Text = "T.Ciclo medio"; // era OEE lblDurata.Text = "Durata"; // valori valMacchina.Text = tabMacchine.FindByIdxMacchina(IdxMacchina).Nome; - valCodKanban.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).KanbanCode; + valCodArticolo.Text = tabStatoMacchine.FindByIdxMacchina(IdxMacchina).CodArticolo; // carico ultimo stato che sia durato almeno 6 sec (0.1 min) int idxStato = 0; int oreTot = 0; @@ -263,7 +263,6 @@ namespace MoonPro.WebUserControls tabMacchine = MapoDb.DataLayer.obj.taMacchine.GetData(); tabStatoMacchine = MapoDb.DataLayer.obj.taStatoMacchine.GetData(); tabAnagStati = MapoDb.DataLayer.obj.taAnagStati.GetData(); - //tabKanban = taKanban.GetData(); tabKeepAlive = MapoDb.DataLayer.obj.taKeepAlive.GetData(); } catch diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs index ab3fc9ad..53274364 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.designer.cs @@ -40,22 +40,22 @@ namespace MoonPro.WebUserControls { protected global::System.Web.UI.WebControls.LinkButton lnkMacchina; /// - /// lblCodKanban control. + /// lblCodArticolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label lblCodKanban; + protected global::System.Web.UI.WebControls.Label lblCodArticolo; /// - /// valCodKanban control. + /// valCodArticolo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Label valCodKanban; + protected global::System.Web.UI.WebControls.Label valCodArticolo; /// /// lblProd control. diff --git a/MP-Site/excelAllMacchineDatiConfermati.aspx.cs b/MP-Site/excelAllMacchineDatiConfermati.aspx.cs index 3862c335..6d59f1f2 100644 --- a/MP-Site/excelAllMacchineDatiConfermati.aspx.cs +++ b/MP-Site/excelAllMacchineDatiConfermati.aspx.cs @@ -105,12 +105,7 @@ public partial class excelAllMacchineDatiConfermati : System.Web.UI.Page { return _resoconti.macchinaDaIdx(idx.ToString()); } - - public string kanbanDaIdx(object idx) - { - DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString()); - return riga.KanbanCode; - } + public void aggiornamento() { gvDatiConf.AllowPaging = false; diff --git a/MP-Site/excelAllMacchineExportEventi.aspx b/MP-Site/excelAllMacchineExportEventi.aspx index 3e8d7895..89252150 100644 --- a/MP-Site/excelAllMacchineExportEventi.aspx +++ b/MP-Site/excelAllMacchineExportEventi.aspx @@ -23,10 +23,9 @@ - + - diff --git a/MP-Site/excelAllMacchineExportEventi.aspx.cs b/MP-Site/excelAllMacchineExportEventi.aspx.cs index f5c23c62..0ba3f47d 100644 --- a/MP-Site/excelAllMacchineExportEventi.aspx.cs +++ b/MP-Site/excelAllMacchineExportEventi.aspx.cs @@ -105,12 +105,6 @@ public partial class excelAllMacchineExportEventi : System.Web.UI.Page { return _resoconti.macchinaDaIdx(idx.ToString()); } - - public string kanbanDaIdx(object idx) - { - DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString()); - return riga.KanbanCode; - } public void aggiornamento() { gvEventi.AllowPaging = false; diff --git a/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs b/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs index 94aea833..e4b9672c 100644 --- a/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs +++ b/MP-Site/excelAllMacchineExportEventi.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-Site/excelAllMacchineExportStati.aspx b/MP-Site/excelAllMacchineExportStati.aspx index 99a7f2d7..248f6d3e 100644 --- a/MP-Site/excelAllMacchineExportStati.aspx +++ b/MP-Site/excelAllMacchineExportStati.aspx @@ -23,8 +23,7 @@ - - + diff --git a/MP-Site/excelAllMacchineExportStati.aspx.cs b/MP-Site/excelAllMacchineExportStati.aspx.cs index 80c63b32..37bb38a3 100644 --- a/MP-Site/excelAllMacchineExportStati.aspx.cs +++ b/MP-Site/excelAllMacchineExportStati.aspx.cs @@ -105,11 +105,6 @@ public partial class excelAllMacchineExportStati : System.Web.UI.Page { return _resoconti.tipoDaIdx(Convert.ToInt32(idx)); } - public string kanbanDaIdx(object idx) - { - DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString()); - return riga.KanbanCode; - } public void aggiornamento() { gvStati.AllowPaging = false; diff --git a/MP-Site/excelAllMacchineExportStati.aspx.designer.cs b/MP-Site/excelAllMacchineExportStati.aspx.designer.cs index 2b60104d..3ecca14a 100644 --- a/MP-Site/excelAllMacchineExportStati.aspx.designer.cs +++ b/MP-Site/excelAllMacchineExportStati.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-Site/excelExportDatiConfermati.aspx.cs b/MP-Site/excelExportDatiConfermati.aspx.cs index 46e4945a..e0c18621 100644 --- a/MP-Site/excelExportDatiConfermati.aspx.cs +++ b/MP-Site/excelExportDatiConfermati.aspx.cs @@ -104,12 +104,6 @@ public partial class excelExportDatiConfermati : System.Web.UI.Page { return _resoconti.macchinaDaIdx(idx.ToString()); } - - public string kanbanDaIdx(object idx) - { - DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString()); - return riga.KanbanCode; - } public void aggiornamento() { gvDatiConf.AllowPaging = false; diff --git a/MP-Site/excelExportEventi.aspx b/MP-Site/excelExportEventi.aspx index 73e6f9a6..d1810c56 100644 --- a/MP-Site/excelExportEventi.aspx +++ b/MP-Site/excelExportEventi.aspx @@ -23,10 +23,9 @@ - + - diff --git a/MP-Site/excelExportEventi.aspx.cs b/MP-Site/excelExportEventi.aspx.cs index e59a712f..dd2fbf2d 100644 --- a/MP-Site/excelExportEventi.aspx.cs +++ b/MP-Site/excelExportEventi.aspx.cs @@ -105,12 +105,6 @@ public partial class excelExportEventi : System.Web.UI.Page { return _resoconti.macchinaDaIdx(idx.ToString()); } - - public string kanbanDaIdx(object idx) - { - DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString()); - return riga.KanbanCode; - } public void aggiornamento() { gvEventi.AllowPaging = false; diff --git a/MP-Site/excelExportEventi.aspx.designer.cs b/MP-Site/excelExportEventi.aspx.designer.cs index 9614cf95..7d8fa2de 100644 --- a/MP-Site/excelExportEventi.aspx.designer.cs +++ b/MP-Site/excelExportEventi.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MP-Site/excelExportStati.aspx b/MP-Site/excelExportStati.aspx index afecbdaf..06aa8934 100644 --- a/MP-Site/excelExportStati.aspx +++ b/MP-Site/excelExportStati.aspx @@ -23,8 +23,7 @@ - - + diff --git a/MP-Site/excelExportStati.aspx.cs b/MP-Site/excelExportStati.aspx.cs index 0d5ff95e..802b983e 100644 --- a/MP-Site/excelExportStati.aspx.cs +++ b/MP-Site/excelExportStati.aspx.cs @@ -105,11 +105,6 @@ public partial class excelExportStati : System.Web.UI.Page { return _resoconti.tipoDaIdx(Convert.ToInt32(idx)); } - public string kanbanDaIdx(object idx) - { - DS_applicazione.KanbanRow riga = _resoconti.kanbanDaIdx(idx.ToString()); - return riga.KanbanCode; - } public void aggiornamento() { gvStati.AllowPaging = false; diff --git a/MP-Site/excelExportStati.aspx.designer.cs b/MP-Site/excelExportStati.aspx.designer.cs index 4ffed1d0..cc86cf3c 100644 --- a/MP-Site/excelExportStati.aspx.designer.cs +++ b/MP-Site/excelExportStati.aspx.designer.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/MapoDb/utility.cs b/MapoDb/utility.cs index c8fc6814..254ee1ea 100644 --- a/MapoDb/utility.cs +++ b/MapoDb/utility.cs @@ -231,7 +231,7 @@ public enum tipoBarcode /// /// identifica un cartellino di tipo CodArticolo /// - CodArticolo, + codArticolo, /// /// identifica un codice per le attività di inizio/fine attrezzaggio e inizio/fine produzione ///