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

Abilitato SEMPRE edit movimenti (in attesa gest user e ruoli)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-18 17:00:28 +01:00
parent 36641e39d3
commit 25e94a4389
4 changed files with 96 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=177']) {
withEnv(['NEXT_BUILD_NUMBER=178']) {
// impiego numero di build del SINGOLO RAMO
// env.versionNumber = VersionNumber(versionNumberString : '1.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
// forzo numero di build x tutti rami uguali
StockManMVC/Controllers/ItemsController.cs
+9 -6
View File
@@ -1,12 +1,11 @@
using System;
using StockManMVC.Models;
using System.Collections.Generic;
using System.Data;
using System.Data.Entity;
using System.Linq;
using System.Net;
using System.Web;
using System.Web.Configuration;
using System.Web.Mvc;
using StockManMVC.Models;
namespace StockManMVC.Controllers
{
@@ -258,12 +257,16 @@ namespace StockManMVC.Controllers
{
return HttpNotFound();
}
// !!!FIXME!!! modificare x abilitare SOLO con ruoli
// 2017.01.03 aggiunto controllo x permesso a resettare INTERA catena flussi + stock... SE in URL si trova comando enabFR=enabFR_key (da webconfig)...
ViewBag.DisplFR = "disabled invisible zeroWidth";
if (enabFR != null)
bool enableAll = false;
bool.TryParse(WebConfigurationManager.AppSettings["enabFR_all"], out enableAll);
if (enabFR != null || enableAll)
{
string enabFR_key = System.Web.Configuration.WebConfigurationManager.AppSettings["enabFR_key"];
if (enabFR == enabFR_key) ViewBag.DisplFR = "";
string enabFR_key = WebConfigurationManager.AppSettings["enabFR_key"];
if (enabFR == enabFR_key || enableAll) ViewBag.DisplFR = "";
}
// restituisco vista parziale
return View(item);
StockManMVC/Views/Items/Details.cshtml
+85 -85
View File
@@ -1,108 +1,108 @@
@model StockManMVC.Models.Item
@{
ViewBag.Title = "Details";
ViewBag.Title = "Details";
}
@using MVCGrid.Web
<div class="row" style="margin-top: 0.5em;">
<div class="col-sm-3">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Dettaglio Articolo</strong>
@if (Model.ItemStock.Count + Model.ItemFlux.Count == 0)
{
// se non ho giacenze permetto eliminazione!
<button class="btn btn-xs btn-danger pull-right" onclick="LoadItemDelete(@Model.ID);">Elimina <i class="glyphicon glyphicon-trash"></i></button>
}
</div>
<div class="panel-body small">
<div id="itemPartialView">
@Html.Partial("_ItemDetail")
@*qui carico dinamicamente le view dell'ITEM*@
</div>
<div class="col-sm-3">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Dettaglio Articolo</strong>
@if (Model.ItemStock.Count + Model.ItemFlux.Count == 0)
{
// se non ho giacenze permetto eliminazione!
<button class="btn btn-xs btn-danger pull-right" onclick="LoadItemDelete(@Model.ID);">Elimina <i class="glyphicon glyphicon-trash"></i></button>
}
</div>
<div class="panel-body small">
<div id="itemPartialView">
@Html.Partial("_ItemDetail")
@*qui carico dinamicamente le view dell'ITEM*@
</div>
<div id="divButtons" class="form-group no-color row">
<div class="col-sm-6 padZR">
<button class="btn btn-sm btn-default form-control" onclick="LoadItemEdit(@Model.ID);">Modifica <i class="glyphicon glyphicon-edit"></i></button>
</div>
<div class="col-sm-6 padZL">
<a href="@Url.Action("Index", "Items", new { id=Model.ID })" class="btn btn-sm btn-info form-control">Torna ad elenco <i class="glyphicon glyphicon-retweet"></i></a>
</div>
</div>
</div>
<div id="divButtons" class="form-group no-color row">
<div class="col-sm-6 padZR">
<button class="btn btn-sm btn-default form-control" onclick="LoadItemEdit(@Model.ID);">Modifica <i class="glyphicon glyphicon-edit"></i></button>
</div>
<div class="col-sm-6 padZL">
<a href="@Url.Action("Index", "Items", new { id=Model.ID })" class="btn btn-sm btn-info form-control">Torna ad elenco <i class="glyphicon glyphicon-retweet"></i></a>
</div>
</div>
</div>
</div>
<div class="col-sm-4 small">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Stock Giacenze</strong>
</div>
<div class="panel-body small">
@Html.MVCGrid("StockItemsGrid")
<div class="row" style="margin-top: 0.5em; margin-bottom: 0.5em;">
<div class="col-xs-6 padZR">
<a href="@Url.Action("Consolidate", "Items", new { id = Model.ID, caller="Items" })" class="btn btn-sm btn-default form-control" onClick="return confirm('Sicuro di voler confermare i movimenti da registrare?')">
<i class="glyphicon glyphicon-save" aria-hidden="true"></i>
Conf. movimenti
</a>
</div>
<div class="col-xs-6 padZL">
<a href="@Url.Action("ShrinkHistory", "Items", new { id = Model.ID, caller="Items" })" class="btn btn-sm btn-default form-control" onClick="return confirm('Sicuro di voler eliminare i movimenti duplicati?')">
Elim. duplicati
<i class="glyphicon glyphicon-compressed" aria-hidden="true"></i>
</a>
</div>
</div>
<div class="row" id="divBtnIF">
<div class="col-xs-3 padZR">
<button class="btn btn-sm btn-info form-control" onclick="CreateNewMov(@Model.ID, 'OFOR');"><i class="glyphicon glyphicon-plus" aria-hidden="true"></i> Ord.Forn</button>
</div>
<div class="col-xs-3 padZRL">
<button class="btn btn-sm btn-success form-control" onclick="CreateNewMov(@Model.ID, 'CAR');"><i class="glyphicon glyphicon-plus" aria-hidden="true"></i> Carico</button>
</div>
<div class="col-xs-3 padZRL">
<button class="btn btn-sm btn-danger form-control" onclick="CreateNewMov(@Model.ID, 'SCAR');"><i class="glyphicon glyphicon-minus" aria-hidden="true"></i> Scarico</button>
</div>
<div class="col-xs-3 padZL">
<button class="btn btn-sm btn-warning form-control" onclick="CreateNewMov(@Model.ID, 'RETT');"><i class="glyphicon glyphicon-edit" aria-hidden="true"></i> Rettifica</button>
</div>
</div>
<div class="row">
<div class="col-xs-12 small" id="divCreateMov">
@*qui inserisco la partial view...*@
</div>
</div>
</div>
</div>
<div class="col-sm-4 small">
<div class="panel panel-default">
<div class="panel-heading">
<strong>Stock Giacenze</strong>
</div>
<div class="panel-body small">
@Html.MVCGrid("StockItemsGrid")
<div class="row" style="margin-top: 0.5em; margin-bottom: 0.5em;">
<div class="col-xs-6 padZR">
<a href="@Url.Action("Consolidate", "Items", new { id = Model.ID, caller="Items" })" class="btn btn-sm btn-default form-control" onClick="return confirm('Sicuro di voler confermare i movimenti da registrare?')">
<i class="glyphicon glyphicon-save" aria-hidden="true"></i>
Conf. movimenti
</a>
</div>
<div class="col-xs-6 padZL">
<a href="@Url.Action("ShrinkHistory", "Items", new { id = Model.ID, caller="Items" })" class="btn btn-sm btn-default form-control" onClick="return confirm('Sicuro di voler eliminare i movimenti duplicati?')">
Elim. duplicati
<i class="glyphicon glyphicon-compressed" aria-hidden="true"></i>
</a>
</div>
</div>
</div>
<div class="col-sm-5">
<div class="panel panel-default">
<div class="panel-heading">
<div class="row">
<div class="col-xs-10">
<strong>Movimenti</strong> (data indica movimenti <del>confermati</del> o <span class="text-warning mark">da registrare</span>)
</div>
<div class="col-xs-2 ">
<a href="@Url.Action("ResetAll", "Items", new { id = Model.ID, caller="Items" })" class="btn btn-sm btn-danger text-right @ViewBag.DisplFR" onClick="return confirm('Sicuro di voler resettare tutta la storia dei movimenti?')" title="Reset ALL">
<i class="glyphicon glyphicon-alert" aria-hidden="true"></i>
</a>
</div>
</div>
</div>
<div class="panel-body small">
@Html.Action("ListByItem", "ItemFluxes", new { ItemID = @Model.ID, page = ViewBag.page, pageSize = ViewBag.pageSize })
</div>
<div class="row" id="divBtnIF">
<div class="col-xs-3 padZR">
<button class="btn btn-sm btn-info form-control" onclick="CreateNewMov(@Model.ID, 'OFOR');"><i class="glyphicon glyphicon-plus" aria-hidden="true"></i> Ord.Forn</button>
</div>
<div class="col-xs-3 padZRL">
<button class="btn btn-sm btn-success form-control" onclick="CreateNewMov(@Model.ID, 'CAR');"><i class="glyphicon glyphicon-plus" aria-hidden="true"></i> Carico</button>
</div>
<div class="col-xs-3 padZRL">
<button class="btn btn-sm btn-danger form-control" onclick="CreateNewMov(@Model.ID, 'SCAR');"><i class="glyphicon glyphicon-minus" aria-hidden="true"></i> Scarico</button>
</div>
<div class="col-xs-3 padZL">
<button class="btn btn-sm btn-warning form-control" onclick="CreateNewMov(@Model.ID, 'RETT');"><i class="glyphicon glyphicon-edit" aria-hidden="true"></i> Rettifica</button>
</div>
</div>
<div class="row">
<div class="col-xs-12 small" id="divCreateMov">
@*qui inserisco la partial view...*@
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-5">
<div class="panel panel-default">
<div class="panel-heading">
<div class="row">
<div class="col-xs-10">
<strong>Movimenti</strong> (data indica movimenti <del>confermati</del> o <span class="text-warning mark">da registrare</span>)
</div>
<div class="col-xs-2 ">
<a href="@Url.Action("ResetAll", "Items", new { id = Model.ID, caller="Items" })" class="btn btn-sm btn-danger text-right @ViewBag.DisplFR" onClick="return confirm('Sicuro di voler abilitare la modifica di tutta la storia dei movimenti? sarà necessario dare nuovametne conferma per tutti i movimenti.')" title="Enable edit ALL">
<i class="glyphicon glyphicon-alert" aria-hidden="true"></i>
</a>
</div>
</div>
</div>
<div class="panel-body small">
@Html.Action("ListByItem", "ItemFluxes", new { ItemID = @Model.ID, page = ViewBag.page, pageSize = ViewBag.pageSize })
</div>
</div>
</div>
</div>
<script type="text/javascript">
function CreateNewMov(ItemID, MovTypeID) {
$("#divCreateMov").load('@(Url.Action("CreatePrecompiled", "ItemFluxes", null, Request.Url.Scheme))?ItemID=' + ItemID + '&MovTypeID=' + MovTypeID);
}
function LoadItemDetail(ItemID) {
$("#itemPartialView").load('@(Url.Action("CurrItemDetail", "Items", null, Request.Url.Scheme))?ID=' + ItemID);
$("#divButtons").show();
StockManMVC/Web.config
+1
View File
@@ -15,6 +15,7 @@
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
<add key="Environment" value="Dev" />
<add key="enabFR_all" value="true" />
<add key="enabFR_key" value="@tt1v@t0" />
<add key="BaseUrl" value="http://10.74.82.219/StockMan/STEA/" />
<add key="RepServUrl" value="http://sql-steam/Reports/Pages/Report.aspx" />