Merge branch 'develop' into feature/Integry_PVM_AggiornamentoQueryFido

This commit is contained in:
2023-06-13 15:20:40 +02:00
16 changed files with 63 additions and 56 deletions

View File

@@ -305,7 +305,7 @@ export default class AgricoperAnalisiBudget extends AnalisiBudget {
title: "%<br>Premium",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
headerAttributes: {
class: "text-racc"
@@ -326,7 +326,7 @@ export default class AgricoperAnalisiBudget extends AnalisiBudget {
title: "%<br>Classe 1",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
headerAttributes: {
class: "text-racc"
@@ -347,7 +347,7 @@ export default class AgricoperAnalisiBudget extends AnalisiBudget {
title: "%<br>Classe 2",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
headerAttributes: {
class: "text-racc"
@@ -414,7 +414,7 @@ export default class AgricoperAnalisiBudget extends AnalisiBudget {
title: "%<br>Premium",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
headerAttributes: {
class: "text-racc"
@@ -435,7 +435,7 @@ export default class AgricoperAnalisiBudget extends AnalisiBudget {
title: "%<br>Classe 1",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
headerAttributes: {
class: "text-racc"
@@ -456,7 +456,7 @@ export default class AgricoperAnalisiBudget extends AnalisiBudget {
title: "%<br>Classe 2",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
headerAttributes: {
class: "text-racc"

View File

@@ -212,9 +212,10 @@ export default class RossogargAnalisiBudget extends AnalisiBudget {
]
},
{
id: "93f19d70-5c37-431b-ad42-3793274a1fc7",
title: `Quantit&agrave; vendute ${annoC.toString()}`,
id: "82553e3d-76b1-4c7d-b871-486f46187448",
title: "Budget",
columns: [
{
id: "84551871-ab52-457e-a2be-f80211401998",
field: "qta_bdg_vend",
@@ -265,6 +266,29 @@ export default class RossogargAnalisiBudget extends AnalisiBudget {
selectOnFocus: true
})
},
{
id: "70171346-9c66-459c-9a17-a5c0aaff4116",
field: "perc_budget",
title: "% Avanz.<br>A.C.",
type: "number",
attributes: {
class: "!k-text-right"
},
filterable: false,
groupable: false,
editable: () => false,
template: (data: Budget) => data.perc_budget && this.numberFormat(data.perc_budget, undefined, "", "%") || "",
groupHeaderColumnTemplate: ({qta_bdg_vend, qta_vend_anno_c}) =>
qta_bdg_vend?.sum &&
qta_vend_anno_c?.sum &&
this.numberFormat(qta_vend_anno_c.sum / qta_bdg_vend.sum * 100, undefined, "", "%") || ""
}
],
},
{
id: "93f19d70-5c37-431b-ad42-3793274a1fc7",
title: `Quantit&agrave; vendute ${annoC.toString()}`,
columns: [
{
id: "f81347dc-92d8-4d5e-bd37-9f06e01a689c",
field: "qta_vend_anno_c",
@@ -281,23 +305,6 @@ export default class RossogargAnalisiBudget extends AnalisiBudget {
groupHeaderColumnTemplate: ({qta_vend_anno_c}) => qta_vend_anno_c?.sum && this.numberFormat(qta_vend_anno_c.sum) || "",
footerTemplate: ({qta_vend_anno_c}) => qta_vend_anno_c?.sum && this.numberFormat(qta_vend_anno_c.sum) || ""
},
{
id: "70171346-9c66-459c-9a17-a5c0aaff4116",
field: "perc_budget",
title: "% Budget",
type: "number",
attributes: {
class: "!k-text-right"
},
filterable: false,
groupable: false,
editable: () => false,
template: (data: Budget) => data.perc_budget && this.numberFormat(data.perc_budget, undefined, "", "%") || "",
groupHeaderColumnTemplate: ({qta_bdg_vend, qta_vend_anno_c}) =>
qta_bdg_vend?.sum &&
qta_vend_anno_c?.sum &&
this.numberFormat(qta_vend_anno_c.sum / qta_bdg_vend.sum * 100, undefined, "", "%") || ""
},
{
id: "37eea8cc-09e0-40e1-bd9d-61c42a48a915",
field: "qta_vend_gen_c",

View File

@@ -42,7 +42,7 @@ const _fabbLinea = {
title: "Linee in Blacklist",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: true,
},

View File

@@ -18,7 +18,7 @@ const _budgetVendite = {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{
@@ -26,7 +26,7 @@ const _budgetVendite = {
title: "Settimana",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
width: "7%",
filterable: {
@@ -51,7 +51,7 @@ const _budgetVendite = {
width: "10%",
format: "{0:dddd dd/MM/yyyy}",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: {
cell: {
@@ -67,7 +67,7 @@ const _budgetVendite = {
type: "number",
width: "8%",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: {
cell: {
@@ -82,7 +82,7 @@ const _budgetVendite = {
type: "string",
width: "10%",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: {
cell: {
@@ -98,7 +98,7 @@ const _budgetVendite = {
type: "string",
width: "10%",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: {
cell: {
@@ -113,7 +113,7 @@ const _budgetVendite = {
title: "Variet&agrave;",
width: "10%",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
template(row) {
return row.varieta?.map(prodotto => prodotto.descrizione).join(", ");
@@ -177,7 +177,7 @@ const _budgetVendite = {
type: "number",
filterable: true,
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
aggregates: ["sum"],
footerTemplate: "Tot.kg: #= number_format_datatable().display(sum) #",
@@ -190,7 +190,7 @@ const _budgetVendite = {
title: "Colli Ordinati",
filterable: true,
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
aggregates: ["sum"],
footerTemplate: "Tot.colli: #= number_format_datatable().display(sum) #",

View File

@@ -77,7 +77,7 @@ const _chkDocsA = {
{
selectable: true,
attributes: {
"class": "k-text-center selezionatore",
"class": "!k-text-center selezionatore",
}
},
{

View File

@@ -743,7 +743,7 @@ PopupOfferta.prototype.open = function () {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{
@@ -805,7 +805,7 @@ PopupOfferta.prototype.open = function () {
// field: "prz_acq",
// title: "In Listino",
// attributes: {
// class: "k-text-center"
// class: "!k-text-center"
// },
// template(data) {
// if (!_.isNil(data.prz_acq)) {

View File

@@ -636,7 +636,7 @@ PopupOfferta.prototype.open = function () {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{
@@ -682,7 +682,7 @@ PopupOfferta.prototype.open = function () {
field: "prz_vend",
title: "In Listino",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
template(data) {
if (!_.isNil(data.prz_vend)) {

View File

@@ -137,7 +137,7 @@ class ControlloGiacenze {
array(
"field" => "selectable",
"width" => "50px",
"attributes" => array("class" => 'k-text-center'),
"attributes" => array("class" => '!k-text-center'),
"selectable" => true,
"filterable" => false,
"sortable" => false,

View File

@@ -133,7 +133,7 @@ class ImportaOrdiniVenditaWeb {
return array(
array(
"width" => "50px",
"attributes" => array("class" => 'k-text-center'),
"attributes" => array("class" => '!k-text-center'),
"selectable" => true,
),
array(

View File

@@ -56,7 +56,7 @@ PopupJson.prototype.open = function ($tr) {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{

View File

@@ -512,7 +512,7 @@ function PopupOfferta() {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{
@@ -554,7 +554,7 @@ function PopupOfferta() {
field: "prz_vend",
title: "In Listino",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
template(data) {
if (!_.isNil(data.prz_vend)) {

View File

@@ -888,7 +888,7 @@ function PopupSchedaCosti() {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{

View File

@@ -123,7 +123,7 @@ const _pianificazioneProduzioneOrto = {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{
@@ -132,7 +132,7 @@ const _pianificazioneProduzioneOrto = {
type: "date",
format: "{0:dddd dd/MM/yyyy}",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: {
cell: {
@@ -147,7 +147,7 @@ const _pianificazioneProduzioneOrto = {
field: "varieta",
title: "Variet&agrave;",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
template(row) {
if (row.varieta) {
@@ -309,7 +309,7 @@ const _pianificazioneProduzioneOrto = {
title: "Qt&agrave;<br>ordinata",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: false,
aggregates: ["sum"],
@@ -327,7 +327,7 @@ const _pianificazioneProduzioneOrto = {
title: "Ore<br>necessarie",
type: "number",
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: false,
template(data) {
@@ -339,7 +339,7 @@ const _pianificazioneProduzioneOrto = {
title: "Sosp.",
sortable: false,
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
template(data) {
return data.flag_sospeso === "S" ? "Si" : "No";
@@ -377,7 +377,7 @@ const _pianificazioneProduzioneOrto = {
title: "Mag.",
sortable: false,
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
template(data) {
return data.magaz ? "Si" : "No";

View File

@@ -589,7 +589,7 @@ function PopupGenerateOrders() {
selectable: true,
width: "50px",
attributes: {
class: "k-text-center"
class: "!k-text-center"
}
},
{

View File

@@ -499,7 +499,7 @@ const _verificaAggiornamentoPrezzi = {
minResizableWidth: 50,
filterable: true,
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
locked: true
},

View File

@@ -103,7 +103,7 @@ const _kendo = {
return this.setDefaultOptions(
{
attributes: {
class: "k-text-center"
class: "!k-text-center"
},
filterable: {
cell: {