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

fix doc editor

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-24 15:45:23 +02:00
parent 5994cfd2a9
commit 2db8e20fdb
5 changed files with 89 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SHERPA.BBM.UI/Components/DocsEditor.razor
+2 -2
View File
@@ -34,11 +34,11 @@
</div>
<div class="col-6 col-lg-3">
<label for="descript">Descrizione:</label>
<InputTextArea id="descript" cla @bind-Value="_currItem.Descript" class="form-control form-control-sm" />
<InputTextArea id="descript" @bind-Value="_currItem.Descript" class="form-control form-control-sm" />
</div>
<div class="col-6 col-lg-3">
<label for="Note">Note:</label>
<InputTextArea id="Note" cla @bind-Value="_currItem.Note" class="form-control form-control-sm" />
<InputTextArea id="Note" @bind-Value="_currItem.Note" class="form-control form-control-sm" />
</div>
<div class="col-6 col-lg-3">
<label for="Basket">Basket:</label>
SHERPA.BBM/Controllers/BBMController.cs
+64 -62
View File
@@ -44,64 +44,6 @@ namespace SHERPA.BBM.Controllers
#region Public Methods
/// <summary>
/// Importo complessivo fatture EMESSE x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public decimal SumTotImporto(int anno = 0)
{
decimal answ = dbCtx
.DbSetFatt2Doc
.Where(x => (x.DataIns.Year == anno || anno == 0))
.Select(x => x.Importo)
.Sum();
return answ;
}
/// <summary>
/// Incasso complessivo fatture INCASSATE x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public decimal SumTotIncasso(int anno = 0)
{
decimal answ = dbCtx
.DbSetFatt2Doc
.Where(x => (x.DataIns.Year == anno || anno == 0))
.Select(x => x.Incassato)
.Sum();
return answ;
}
/// <summary>
/// Valore complessivo ORDINATO x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public double SumTotOrdinato(int anno = 0)
{
double answ = dbCtx
.DbSetResources
.Where(x => ((x.Document.DataIns.Year == anno || anno == 0) && x.Document.DocType == BbmDocType.OrderConfirm))
.Select(x => x.FinalPrice)
.Sum();
return answ;
}
/// <summary>
/// Valore complessivo TRATTATO x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public double SumTotTrattato(int anno = 0)
{
double answ = dbCtx
.DbSetResources
.Where(x => ((x.Document.DataIns.Year == anno || anno == 0) && x.Document.IsActive))
.Select(x => x.FinalPrice)
.Sum();
return answ;
}
/// <summary>
/// Aggiunge un nuovo item Basket
/// </summary>
@@ -145,7 +87,7 @@ namespace SHERPA.BBM.Controllers
{ }
return done;
}
public int BasketsCount()
{
int answ = dbCtx
@@ -215,14 +157,14 @@ namespace SHERPA.BBM.Controllers
/// </summary>
/// <param name="IdxFatt"></param>
/// <returns></returns>
public bool BillDelete(int IdxFatt)
public bool BillDelete(DatabaseModels.Fatt2DocModel delItem)
{
bool done = false;
try
{
var item2del = dbCtx
.DbSetFatt2Doc
.Where(x => x.IdxFatt == IdxFatt)
.Where(x => x.IdxFatt == delItem.IdxFatt && x.DataIns == delItem.DataIns && x.DocId == delItem.DocId)
.FirstOrDefault();
dbCtx.DbSetFatt2Doc.Remove(item2del);
dbCtx.SaveChanges();
@@ -328,7 +270,7 @@ namespace SHERPA.BBM.Controllers
{
var currData = dbCtx
.DbSetFatt2Doc
.Where(x => x.IdxFatt == updItem.IdxFatt)
.Where(x => x.IdxFatt == updItem.IdxFatt && x.DataIns == updItem.DataIns && x.DocId == updItem.DocId)
.FirstOrDefault();
if (currData != null)
{
@@ -1231,6 +1173,66 @@ namespace SHERPA.BBM.Controllers
return answ;
}
/// <summary>
/// Importo complessivo fatture EMESSE x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public decimal SumTotImporto(int anno = 0)
{
decimal answ = dbCtx
.DbSetFatt2Doc
.Where(x => (x.DataIns.Year == anno || anno == 0))
.Select(x => x.Importo)
.Sum();
return answ;
}
/// <summary>
/// Incasso complessivo fatture INCASSATE x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public decimal SumTotIncasso(int anno = 0)
{
decimal answ = dbCtx
.DbSetFatt2Doc
.Where(x => (x.DataIns.Year == anno || anno == 0))
.Select(x => x.Incassato)
.Sum();
return answ;
}
/// <summary>
/// Valore complessivo ORDINATO x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public double SumTotOrdinato(int anno = 0)
{
double answ = dbCtx
.DbSetResources
.Where(x => ((x.Document.DataIns.Year == anno || anno == 0) && x.Document.DocType == BbmDocType.OrderConfirm))
.Select(x => x.FinalPrice)
.Sum();
return answ;
}
/// <summary>
/// Valore complessivo TRATTATO x ANNO
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public double SumTotTrattato(int anno = 0)
{
double answ = dbCtx
.DbSetResources
.Where(x => ((x.Document.DataIns.Year == anno || anno == 0) && x.Document.IsActive))
.Select(x => x.FinalPrice)
.Sum();
return answ;
}
#endregion Public Methods
}
}
SHERPA.BBM/DatabaseModels/Fatt2DocModel.cs
+7 -1
View File
@@ -14,7 +14,10 @@ namespace SHERPA.BBM.DatabaseModels
{
#region Public Properties
[Column("DataIns", Order = 2)]
[Column("AnnoFatt", Order = 6)]
public int AnnoFatt { get; set; } = DateTime.Today.Year;
[Key, Column("DataIns", Order = 2)]
public DateTime DataIns { get; set; } = DateTime.Now;
[Key, Column("DocId", Order = 0)]
@@ -34,6 +37,9 @@ namespace SHERPA.BBM.DatabaseModels
[Precision(18, 4)]
public decimal Incassato { get; set; } = 0;
[Column("NumFatt", Order = 5)]
public int NumFatt { get; set; } = 0;
#endregion Public Properties
}
}
SHERPA.BBM/DatabaseModels/ResurcesModel.cs
+3
View File
@@ -29,6 +29,9 @@ namespace SHERPA.BBM.DatabaseModels
[Column("ItemId", Order = 3)]
public int ItemId { get; set; }
[Column("Note", Order = 9)]
public string Note { get; set; } = "";
[Column("Ordinal", Order = 2)]
public int Ordinal { get; set; } = 0;
SHERPA.BBM/MainDbContext.Views.cs
+13 -7
View File
@@ -11,7 +11,7 @@ using System.Data.Entity.Infrastructure.MappingViews;
[assembly: DbMappingViewCacheTypeAttribute(
typeof(SHERPA.BBM.MainDbContext),
typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySets55dc12bdda60ee6ee4243af52e2aada4f5487a9e61ec040a3680faa62d2764ed))]
typeof(Edm_EntityMappingGeneratedViews.ViewsForBaseEntitySets845c4725b26f7ac2e2a09e62c4aadbf70a314f875ff0296b962905082b94b80c))]
namespace Edm_EntityMappingGeneratedViews
{
@@ -23,14 +23,14 @@ namespace Edm_EntityMappingGeneratedViews
/// Implements a mapping view cache.
/// </summary>
[GeneratedCode("Entity Framework 6 Power Tools", "0.9.2.0")]
internal sealed class ViewsForBaseEntitySets55dc12bdda60ee6ee4243af52e2aada4f5487a9e61ec040a3680faa62d2764ed : DbMappingViewCache
internal sealed class ViewsForBaseEntitySets845c4725b26f7ac2e2a09e62c4aadbf70a314f875ff0296b962905082b94b80c : DbMappingViewCache
{
/// <summary>
/// Gets a hash value computed over the mapping closure.
/// </summary>
public override string MappingHashValue
{
get { return "55dc12bdda60ee6ee4243af52e2aada4f5487a9e61ec040a3680faa62d2764ed"; }
get { return "845c4725b26f7ac2e2a09e62c4aadbf70a314f875ff0296b962905082b94b80c"; }
}
/// <summary>
@@ -230,7 +230,7 @@ namespace Edm_EntityMappingGeneratedViews
{
return new DbMappingView(@"
SELECT VALUE -- Constructing Fatt2DocModel
[CodeFirstDatabaseSchema.Fatt2DocModel](T1.Fatt2DocModel_DocId, T1.Fatt2DocModel_IdxFatt, T1.Fatt2DocModel_DataIns, T1.Fatt2DocModel_Importo, T1.Fatt2DocModel_Incassato)
[CodeFirstDatabaseSchema.Fatt2DocModel](T1.Fatt2DocModel_DocId, T1.Fatt2DocModel_IdxFatt, T1.Fatt2DocModel_DataIns, T1.Fatt2DocModel_Importo, T1.Fatt2DocModel_Incassato, T1.Fatt2DocModel_NumFatt, T1.Fatt2DocModel_AnnoFatt)
FROM (
SELECT
T.DocId AS Fatt2DocModel_DocId,
@@ -238,6 +238,8 @@ namespace Edm_EntityMappingGeneratedViews
T.DataIns AS Fatt2DocModel_DataIns,
T.Importo AS Fatt2DocModel_Importo,
T.Incassato AS Fatt2DocModel_Incassato,
T.NumFatt AS Fatt2DocModel_NumFatt,
T.AnnoFatt AS Fatt2DocModel_AnnoFatt,
True AS _from0
FROM MainDbContext.DbSetFatt2Doc AS T
) AS T1");
@@ -274,7 +276,7 @@ namespace Edm_EntityMappingGeneratedViews
{
return new DbMappingView(@"
SELECT VALUE -- Constructing ResourcesModel
[CodeFirstDatabaseSchema.ResourcesModel](T1.ResourcesModel_ResourceId, T1.ResourcesModel_DocId, T1.ResourcesModel_Ordinal, T1.ResourcesModel_ItemId, T1.ResourcesModel_QtyPrev, T1.ResourcesModel_QtyOff, T1.ResourcesModel_UnitPriceOff, T1.ResourcesModel_FinaPrice)
[CodeFirstDatabaseSchema.ResourcesModel](T1.ResourcesModel_ResourceId, T1.ResourcesModel_DocId, T1.ResourcesModel_Ordinal, T1.ResourcesModel_ItemId, T1.ResourcesModel_QtyPrev, T1.ResourcesModel_QtyOff, T1.ResourcesModel_UnitPriceOff, T1.ResourcesModel_FinaPrice, T1.ResourcesModel_Note)
FROM (
SELECT
T.ResourceId AS ResourcesModel_ResourceId,
@@ -285,6 +287,7 @@ namespace Edm_EntityMappingGeneratedViews
T.QtyOff AS ResourcesModel_QtyOff,
T.UnitPriceOff AS ResourcesModel_UnitPriceOff,
T.FinalPrice AS ResourcesModel_FinaPrice,
T.Note AS ResourcesModel_Note,
True AS _from0
FROM MainDbContext.DbSetResources AS T
) AS T1");
@@ -390,14 +393,16 @@ namespace Edm_EntityMappingGeneratedViews
{
return new DbMappingView(@"
SELECT VALUE -- Constructing DbSetFatt2Doc
[SHERPA.BBM.Fatt2DocModel](T1.Fatt2DocModel_DocId, T1.Fatt2DocModel_IdxFatt, T1.Fatt2DocModel_DataIns, T1.Fatt2DocModel_Importo, T1.Fatt2DocModel_Incassato)
[SHERPA.BBM.Fatt2DocModel](T1.Fatt2DocModel_DocId, T1.Fatt2DocModel_IdxFatt, T1.Fatt2DocModel_DataIns, T1.Fatt2DocModel_AnnoFatt, T1.Fatt2DocModel_Importo, T1.Fatt2DocModel_Incassato, T1.Fatt2DocModel_NumFatt)
FROM (
SELECT
T.DocId AS Fatt2DocModel_DocId,
T.IdxFatt AS Fatt2DocModel_IdxFatt,
T.DataIns AS Fatt2DocModel_DataIns,
T.AnnoFatt AS Fatt2DocModel_AnnoFatt,
T.Importo AS Fatt2DocModel_Importo,
T.Incassato AS Fatt2DocModel_Incassato,
T.NumFatt AS Fatt2DocModel_NumFatt,
True AS _from0
FROM CodeFirstDatabase.Fatt2DocModel AS T
) AS T1");
@@ -434,13 +439,14 @@ namespace Edm_EntityMappingGeneratedViews
{
return new DbMappingView(@"
SELECT VALUE -- Constructing DbSetResources
[SHERPA.BBM.ResourcesModel](T1.ResourcesModel_ResourceId, T1.ResourcesModel_DocId, T1.ResourcesModel_FinalPrice, T1.ResourcesModel_ItemId, T1.ResourcesModel_Ordinal, T1.ResourcesModel_QtyOff, T1.ResourcesModel_QtyPrev, T1.ResourcesModel_UnitPriceOff)
[SHERPA.BBM.ResourcesModel](T1.ResourcesModel_ResourceId, T1.ResourcesModel_DocId, T1.ResourcesModel_FinalPrice, T1.ResourcesModel_ItemId, T1.ResourcesModel_Note, T1.ResourcesModel_Ordinal, T1.ResourcesModel_QtyOff, T1.ResourcesModel_QtyPrev, T1.ResourcesModel_UnitPriceOff)
FROM (
SELECT
T.ResourceId AS ResourcesModel_ResourceId,
T.DocId AS ResourcesModel_DocId,
T.FinaPrice AS ResourcesModel_FinalPrice,
T.ItemId AS ResourcesModel_ItemId,
T.Note AS ResourcesModel_Note,
T.Ordinal AS ResourcesModel_Ordinal,
T.QtyOff AS ResourcesModel_QtyOff,
T.QtyPrev AS ResourcesModel_QtyPrev,