Integry/PVM
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modifiche in popup riep giorno

Browse Source
This commit is contained in:
Anthony Santoro
2023-11-15 12:12:50 +01:00
parent 12e769c5d0
commit 2865127d0f
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public_html/config_aziende/ROSSOGARGANO/delivery_plan/PopupRiepGiorno.css
View File

@@ -1 +1 @@
[id^=table-].k-grid .k-grid-header .k-table-th{vertical-align:middle;font-weight:bold}[id^=table-].k-grid .k-grid-header .k-table-row,[id^=table-].k-grid .k-grouping-header .k-table-row,[id^=table-].k-grid .k-grid-add-row .k-table-row,[id^=table-].k-grid .k-grid-footer .k-table-row{background-color:#dedede}[id^=table-].k-grid .k-grid-header .k-table-row:first-child,[id^=table-].k-grid .k-grouping-header .k-table-row:first-child,[id^=table-].k-grid .k-grid-add-row .k-table-row:first-child,[id^=table-].k-grid .k-grid-footer .k-table-row:first-child{background-color:#bababa}[id^=table-].k-grid .k-grouping-row:not(:first-child) td{border-top-width:1px}[id^=table-].k-grid .k-table-tbody .k-group-cell{background-color:#fff}[id^=table-].k-grid .k-grouping-row .k-group-cell,[id^=table-].k-grid .k-grouping-row+.k-table-row .k-group-cell{border-top-width:1px}.td-hidden{border-left:0 !important;border-right:0 !important;background-color:#fff !important}/*# sourceMappingURL=PopupRiepGiorno.css.map */
[id^=table-].k-grid .k-grid-header .k-table-th{vertical-align:middle;font-weight:bold;text-align:left !important}[id^=table-].k-grid .k-grid-header .k-table-row,[id^=table-].k-grid .k-grouping-header .k-table-row,[id^=table-].k-grid .k-grid-add-row .k-table-row,[id^=table-].k-grid .k-grid-footer .k-table-row{background-color:#dedede}[id^=table-].k-grid .k-grid-header .k-table-row:first-child,[id^=table-].k-grid .k-grouping-header .k-table-row:first-child,[id^=table-].k-grid .k-grid-add-row .k-table-row:first-child,[id^=table-].k-grid .k-grid-footer .k-table-row:first-child{background-color:#bababa}[id^=table-].k-grid .k-grouping-row:not(:first-child) td{border-top-width:1px}[id^=table-].k-grid .k-table-tbody .k-group-cell{background-color:#fff}[id^=table-].k-grid .k-grouping-row .k-group-cell,[id^=table-].k-grid .k-grouping-row+.k-table-row .k-group-cell{border-top-width:1px}.td-hidden{border-left:0 !important;border-right:0 !important;background-color:#fff !important}/*# sourceMappingURL=PopupRiepGiorno.css.map */

15
public_html/config_aziende/ROSSOGARGANO/delivery_plan/PopupRiepGiorno.module.ts
View File

@@ -300,7 +300,7 @@ export default class PopupRiepGiorno extends BasePopup {
const columns = _kendo.setDefaultCellOptions([
{
id: "e2dd706a-ec44-4f69-896b-7330c15e7b2f",
title: firstRiepilogo.data_ora_iniz_trasp && moment(riepiloghi[0].data_ora_iniz_trasp).format("DD/MM/YYYY HH:mm").replace(" ", "<br>") || "",
title: firstRiepilogo.data_ora_iniz_trasp && `Ora Partenza: ${moment(riepiloghi[0].data_ora_iniz_trasp).format("HH:mm")}` || "",
columns: [
{
id: "7e281934-0241-4f35-98cf-f5e6df253eef",
@@ -327,9 +327,9 @@ export default class PopupRiepGiorno extends BasePopup {
{
id: "3bb73886-f814-4701-ae6a-a3543a39241f",
title: firstRiepilogo.vettore && [
firstRiepilogo.vettore,
`Vettore: ${firstRiepilogo.vettore}`,
firstRiepilogo.targa && `Targa ${firstRiepilogo.targa}` || firstRiepilogo.num_prenotazione || ""
].join("<br>") || firstRiepilogo.flag_ritir_clie && "LORO" || "Non assegnato",
].join("<br>") || firstRiepilogo.flag_ritir_clie && "LORO" || "Vettore non assegnato",
columns: [
{
id: "d3598c7d-ea79-48f3-a5c1-6b8c5467378b",
@@ -354,7 +354,7 @@ export default class PopupRiepGiorno extends BasePopup {
},
{
id: "7e54b38c-2271-424f-8d7f-6e484bae5dca",
title: firstRiepilogo.note_viag,
title: firstRiepilogo.note_viag && `Note: ${firstRiepilogo.note_viag}` || "",
columns: [
{
id: "eda00bf7-aa54-4675-94db-af1afb71e834",
@@ -373,7 +373,8 @@ export default class PopupRiepGiorno extends BasePopup {
data: riepilogo.depositi
},
dataTextField: "cod_mdep",
dataValueField: "cod_mdep"
dataValueField: "cod_mdep",
valuePrimitive: true
});
}
},
@@ -663,7 +664,7 @@ export default class PopupRiepGiorno extends BasePopup {
id_viaggio: null
},
template: (data) => {
data.text_field = `Viaggio del ${moment(data.data_ora_iniz_trasp).format("DD/MM/YYYY")} alle ${moment(data.data_ora_iniz_trasp).format("HH:mm")}`;
data.text_field = `Viaggio n. ${data.id_viaggio} ore ${moment(data.data_ora_iniz_trasp).format("HH:mm")} - Vettore ${data.rag_soc}`;
return data.text_field;
},
@@ -728,7 +729,7 @@ export default class PopupRiepGiorno extends BasePopup {
return ret?.returnId === 1;
}
async getViaggi(data: {dataOraInizTrasp: Moment} = null) {
async getViaggi(data: { dataOraInizTrasp: Moment } = null) {
const ret = await this.ajax()
.get("getViaggi")
.data({dataOraInizTrasp: data.dataOraInizTrasp.unix()})

1
public_html/config_aziende/ROSSOGARGANO/delivery_plan/PopupRiepGiorno.scss
View File

@@ -2,6 +2,7 @@
.k-grid-header .k-table-th {
vertical-align: middle;
font-weight: bold;
text-align: left !important;
}
.k-grid-header, .k-grouping-header, .k-grid-add-row, .k-grid-footer {

29
public_html/gest-lib/delivery_plan/sql/get-riepiloghi.sql
View File

@@ -2,11 +2,11 @@ SELECT *
FROM (SELECT vv.id_viaggio,
vv.data_ora_iniz_trasp,
vett.cod_vvet,
vett.rag_soc AS vettore,
vett.rag_soc AS vettore,
vv.flag_ritir_clie,
vv.targa,
vv.num_prenotazione,
vv.note AS note_viag,
vv.note AS note_viag,
dor.gestione,
dor.data_ord,
dor.num_ord,
@@ -15,33 +15,34 @@ FROM (SELECT vv.id_viaggio,
ga.cod_anag,
ga.rag_soc,
dot.rif_ord,
dot.note AS note_ord,
ISNULL(vd.citta, ga.citta) + IIF(dot.note IS NULL, '', ' - ' + dot.note) AS note_ord,
dor.cod_mart,
'COD ' + dor.cod_mart + ' ' + dor.descrizione AS descrizione,
dor.system_note AS cod_mdep,
'COD ' + dor.cod_mart + ' ' + dor.descrizione AS descrizione,
dor.system_note AS cod_mdep,
(SELECT mp.cod_mdep, md.descrizione
FROM mtb_part mp
INNER JOIN dbo.mtb_depo md ON mp.cod_mdep = md.cod_mdep
WHERE cod_mart = dor.cod_mart
-- AND mp.qta_esistente <> 0
FOR JSON PATH) AS depositi,
FOR JSON PATH) AS depositi,
ROUND(dor.num_cnf /
IIF(dor.colli_pedana = 0, 1, dor.colli_pedana),
0) AS pedane_ord,
0) AS pedane_ord,
dor.num_cnf,
dor.note,
dor.gruppo_cons
FROM dtb_ordr dor
INNER JOIN dbo.dtb_ordt dot
INNER JOIN dtb_ordt dot
ON dor.gestione = dot.gestione
AND dor.data_ord = dot.data_ord
AND dor.num_ord = dot.num_ord
INNER JOIN dbo.gtb_anag ga ON dot.cod_anag = ga.cod_anag
INNER JOIN dbo.mtb_aart ma ON dor.cod_mart = ma.cod_mart
INNER JOIN dbo.mtb_grup mg ON ma.cod_mgrp = mg.cod_mgrp
LEFT OUTER JOIN dbo.vtb_viaggi vv ON dor.id_viaggio = vv.id_viaggio
LEFT OUTER JOIN dbo.vtb_vett vett ON vv.cod_vvet = vett.cod_vvet
LEFT OUTER JOIN dbo.stb_user su ON dot.compilato_da = su.full_name
INNER JOIN gtb_anag ga ON dot.cod_anag = ga.cod_anag
INNER JOIN mtb_aart ma ON dor.cod_mart = ma.cod_mart
INNER JOIN mtb_grup mg ON ma.cod_mgrp = mg.cod_mgrp
LEFT OUTER JOIN vtb_viaggi vv ON dor.id_viaggio = vv.id_viaggio
LEFT OUTER JOIN vtb_vett vett ON vv.cod_vvet = vett.cod_vvet
LEFT OUTER JOIN stb_user su ON dot.compilato_da = su.full_name
LEFT OUTER JOIN vtb_dest vd ON dot.cod_anag = vd.cod_anag AND dot.cod_vdes = vd.cod_vdes
WHERE mg.tipo_mgrp = 'PF'
AND dot.gestione = 'V'
AND dor.data_cons = '[dataCons]') t