From 155ae2fb9216a91773ef3f240d5dcf83f6694bbd Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 7 Oct 2016 10:11:54 +0200 Subject: [PATCH] Fix vista + upgrade buttons X correggere visualizzazione giacenze magazzino + grafica migliorata --- .vs/config/applicationhost.config | 2 +- StockManMVC/App_Start/MVCGridConfig.cs | 14 +++++++------- StockManMVC/Views/ItemFamilies/Index.cshtml | 6 +++--- StockManMVC/Views/Items/Index.cshtml | 15 --------------- StockManMVC/Views/LocTypes/Index.cshtml | 4 ++-- .../Views/Locations/_ListByType.cshtml | 4 ++-- StockManMVC/Views/MagStatus/Index.cshtml | 4 ++-- .../Views/MagStatus/_StockByLocation.cshtml | 10 ++++++++-- StockManMVC/Views/MovTypes/Index.cshtml | 4 ++-- StockManMVC/Views/Operators/Index.cshtml | 4 ++-- StockManMVC/bin/StockManMVC.dll | Bin 128000 -> 128000 bytes 11 files changed, 29 insertions(+), 38 deletions(-) diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 3679a11..e4e44f8 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -170,7 +170,7 @@ - + diff --git a/StockManMVC/App_Start/MVCGridConfig.cs b/StockManMVC/App_Start/MVCGridConfig.cs index bef5376..3b66b12 100644 --- a/StockManMVC/App_Start/MVCGridConfig.cs +++ b/StockManMVC/App_Start/MVCGridConfig.cs @@ -52,13 +52,13 @@ namespace StockManMVC { //Add your columns here cols.Add("ViewLink").WithColumnName("ViewLink") + .WithHeaderText("") .WithSorting(false) .WithVisibility(true, false) .WithAllowChangeVisibility(false) - //.WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ID, StockItemID = i.ID, FluxItemID = i.ID })) - .WithValueTemplate(""); + .WithValueTemplate(""); cols.Add("Family").WithColumnName("Family") .WithVisibility(true, false) .WithAllowChangeVisibility(false) @@ -105,14 +105,14 @@ namespace StockManMVC .WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Duplicate", "Items", new { id = i.ID })) - .WithValueTemplate(""); + .WithValueTemplate(""); cols.Add("EditLink").WithColumnName("EditLink") .WithSorting(false) .WithVisibility(true, false) .WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Edit", "Items", new { id = i.ID, mode="full" })) - .WithValueTemplate(""); + .WithValueTemplate(""); }) .WithRetrieveDataMethod((context) => { @@ -262,7 +262,7 @@ namespace StockManMVC .WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Consolidate", "Items", new { id = i.ItemID, caller = "vIF2S" })) - .WithValueTemplate(""); + .WithValueTemplate(""); cols.Add("FamilyID").WithColumnName("FamilyID") .WithVisibility(true, false) .WithHeaderText("Famiglia") @@ -298,10 +298,10 @@ namespace StockManMVC .WithSorting(false) .WithVisibility(true, false) .WithAllowChangeVisibility(false) - //.WithHeaderText("") + //.WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID })) - .WithValueTemplate(""); + .WithValueTemplate(""); }) .WithRetrieveDataMethod((context) => { diff --git a/StockManMVC/Views/ItemFamilies/Index.cshtml b/StockManMVC/Views/ItemFamilies/Index.cshtml index 5e5b955..4303a02 100644 --- a/StockManMVC/Views/ItemFamilies/Index.cshtml +++ b/StockManMVC/Views/ItemFamilies/Index.cshtml @@ -41,7 +41,7 @@ if (item.NumItems > 0) { delStyle = "disabled invisible"; } - + @Html.DisplayFor(modelItem => item.ID) @@ -53,8 +53,8 @@ @Html.DisplayFor(modelItem => item.NumItems) - - + + } diff --git a/StockManMVC/Views/Items/Index.cshtml b/StockManMVC/Views/Items/Index.cshtml index d7932a2..b6020c0 100644 --- a/StockManMVC/Views/Items/Index.cshtml +++ b/StockManMVC/Views/Items/Index.cshtml @@ -3,24 +3,10 @@ @{ ViewBag.Title = "Articoli"; string mainCss = "col-sm-12"; - //bool hasDetail = false; - //if (ViewBag.ItemID != 0) - //{ - // hasDetail = true; - // mainCss = "col-sm-8"; - //} } @using MVCGrid.Web
- @*@if (hasDetail) - { -
- Dettagli -
- stock attuale -
- }*@
@@ -30,7 +16,6 @@ Anagrafica Articoli
- @*@Html.ActionLink("Create New", "Create")*@ Aggiunta Nuovo articolo diff --git a/StockManMVC/Views/LocTypes/Index.cshtml b/StockManMVC/Views/LocTypes/Index.cshtml index 27619bd..00d6372 100644 --- a/StockManMVC/Views/LocTypes/Index.cshtml +++ b/StockManMVC/Views/LocTypes/Index.cshtml @@ -54,8 +54,8 @@ @Html.DisplayFor(modelItem => item.IsFor) - - + + } diff --git a/StockManMVC/Views/Locations/_ListByType.cshtml b/StockManMVC/Views/Locations/_ListByType.cshtml index 4db30a5..8767ce1 100644 --- a/StockManMVC/Views/Locations/_ListByType.cshtml +++ b/StockManMVC/Views/Locations/_ListByType.cshtml @@ -23,8 +23,8 @@ @Html.DisplayFor(modelItem => item.LocType.Descr) - - + + } diff --git a/StockManMVC/Views/MagStatus/Index.cshtml b/StockManMVC/Views/MagStatus/Index.cshtml index a4311b6..9525f38 100644 --- a/StockManMVC/Views/MagStatus/Index.cshtml +++ b/StockManMVC/Views/MagStatus/Index.cshtml @@ -35,7 +35,7 @@ { - + @Html.DisplayFor(modelItem => item.Location.Descr) @@ -53,7 +53,7 @@ @Html.DisplayFor(modelItem => item.TotVal) - + diff --git a/StockManMVC/Views/MagStatus/_StockByLocation.cshtml b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml index 9e30fff..f991452 100644 --- a/StockManMVC/Views/MagStatus/_StockByLocation.cshtml +++ b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml @@ -5,8 +5,9 @@
@* Inject form here *@
- +
+ @@ -21,6 +22,11 @@ @foreach (var item in Model) { + @@ -35,7 +41,7 @@ { ViewBag.id = item.ID; @*Sposta *@ - + } diff --git a/StockManMVC/Views/MovTypes/Index.cshtml b/StockManMVC/Views/MovTypes/Index.cshtml index 7f99682..125f9f2 100644 --- a/StockManMVC/Views/MovTypes/Index.cshtml +++ b/StockManMVC/Views/MovTypes/Index.cshtml @@ -37,8 +37,8 @@ @Html.DisplayFor(modelItem => item.Descr) } diff --git a/StockManMVC/Views/Operators/Index.cshtml b/StockManMVC/Views/Operators/Index.cshtml index ac21cbb..4ed7d46 100644 --- a/StockManMVC/Views/Operators/Index.cshtml +++ b/StockManMVC/Views/Operators/Index.cshtml @@ -49,8 +49,8 @@ @Html.DisplayFor(modelItem => item.FirstName) } diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index c1b08328ce5e3f8918e3189284567b70c302092c..93b820aab2c27e50c66f238490842bca1a105dac 100644 GIT binary patch delta 1718 zcmZYAe@v8h90&04`{5q$xjO>B4+*rp6DSenhXENVQGk+)Mv#!;ZG@IY{^0I7C0VYH z#@1|^96rrc1RvWX%(1}u<4R-UvLCCJ**}kSYFkUk!f8>Ptx@)U?)l!6t=o9^yq?eZ z^L#&izxTOs?~Ju~#v0lex2O5`z#DFy9C)u8Eeen$X4(Ye3ZI=tfwBoXm{49tFl)bE zAo^!5`xA&r{BIK?O%nqBA^Y@9W(j+Dpi~*|bY%vt3B>PnfY?)g3GAAd>bob3#OO6i zIp3L{n#}IAdruQ$@lkdg=uc!hvhr7_i~c(}a571MlalAHa_CP3Um5O>`MTk0?yv*L-@`5`P!F9`)<@Klm#b{;%S@|D7bIqAOPW=Vt9c>hF`4 z?Oo3FyR!eAH*Ds8VdkaC(Y&v_wt!6L2g=HWm-_Y9>?5)eruRb%89HWB=^`xP`dd_K zHr!lQR+TPBHrHB7r8y|%Dzd3G7t6W+U|NDEu8-_0&4Zuo6^BamF&5->5S13-JFYsY zv=F~=U5HcZQg{c9(mZ0AK8O(4JMm#!j1Ob7j?jnDaL^bzBAuek@EcdR?F@YwL@{Ee z_A|5;E+uI2w*4$ELoW~3k#Fd7oC_PVerR+B=DAWV8ZAfKVIwvqYV;8-;<_5I(FzoB zUAJoVQPgmKD{1sGv~eA>X|xhA947kweWcm0(JC{T?$Bs8_VJ-!qS2K&!8O5(S%nF% zWvrMQe9tw-ig_HDx$dxHR^#3yMxj>e3SEN`*DY2|Exu%8^Y@X6?FwConn7b|kNp~b z0trVAt#JHG>#*^dp?)$?pTx^t7a+14Xdv=Ljmj@U)H8ADtihbXsTnrniH@+SPuHHUfXLAp{n?nI?h zJMIj|*2TistkqnlVnL(Nm>W37RVH_X3wI9$LiSzK4&V8 z?cY|k^VmhEcC@=VhuL;Mj{sKzxlisuK)J)pd`WRmID@e+v#>AyHnZo71(j|$yKIW} z;|^2qc$Mxnd#;W3W2dPO){kDi#%HT%9q2Qa#yZfC17?{Sau*IXnPq0k0UR>R%#(MS z@*+>(jpIBv7gr*8Lt;P3`hM*dOXL^LABWFaX?x(Fw4L%L37hkk-P21aPfUN}iR&S| z!v1V5hyd$yV2wfSfYfj1FJyoo>Kgt77nox?2*6j}cPcae}h delta 1888 zcmZXVYfM~46vyYkyO(_-Fqei$fY92qAl+6dNGU#wZB>fUVyWd35vUYWDZ8+=wP_m` zOVc#f2vF`-1^Aeao%`u>mR;%642xOyaWXbkSwjS8c4iF_Q}yg8-3{^HD7PKN79HgdWnWS5$Aa%L_HOx_5L42o zXh+L1GnPU|Kth_sSsXSS7lgO-h1tI~SD;0t8tZW+;2 zD?40U?7XyRJQ!8Hu3U{DXgu!P30Vnq3vWsU&!LnpbE(FC%iOB*oSXkDqp^v-`y09a zbK`dJ|2p-ULxrR$cd+N1y0Bo+w^n-Q5v}KYyoBf(GP8p{2QA+7stsLLU^8$1*6Ir1 zuTtwJQvN|hg*st2<@SvlT2?flrj-@c3xcw2BQy&UidS3u zr|nz16-O0~3dwDnjcb05+7Y1J@T;ImQ-J2ceo2dUNdfvaVgyZx1n4tZE9ikaK%Ygn zpdTy&`W%V{eP|8P?Rf1H;q}`{i7h~L^QHZo+rOY@Qak+$@N?I&6Q^07wS z?7z`MGYLlJ{egQxPj4 zVU^@pk*R7WrWhSSsi01qB$uE=P`O=_OYxPU0V2s|m=-jTMOuzfW!sl=-i%(J%NLXD zSTI!JoRibJm>fq4snB=J#CCFp(hULnx_+#qY+oyNN?{#DGLAJnXcC0lh6Ewx>kWSs~kZVyZVonk(*P&Li55#$0L7yi6@G9|#^@%jG z0a>ARgG%4jCvud{ZoN(kAu2th&u1l@-3FcN*zCG+QfS!Arqzv;UV+hUTpMvl(3CAv zZqljSo+x{8LByOSRc_YFg;e<{E{fQ^af^Hmi-Jx`Tjb;VAIS|S?X4AJ(oV2;2RB@) z3Rf4i1ccS8i-34MWG{aKI3>CK8YjZhaP?2vg9NxE|%fp#O9dW+O@;Rxe05 z4(;sxeRzDLzA|>`gaenaJJ}6aLfFGEuy}S~rLp@hZ3bjt@vh>`HG4j|-Tcq)YZq-3 zR|jJ6`-^5!Zr=ZLWuwPk
@Html.DisplayNameFor(model => model.Item.Descr)
+ + + + @Html.DisplayFor(modelItem => item.Item.Descr)
- - + +
- - + +