Merge pull request '7145-wordBreak' (!2247) from 7145-wordBreak into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2247 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
2cf5e94002
|
@ -1,3 +1,9 @@
|
|||
td{
|
||||
overflow: hidden;
|
||||
max-width: 100px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
h1 {
|
||||
text-align: center;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
SELECT
|
||||
r.id,
|
||||
SELECT r.id,
|
||||
r.m3,
|
||||
r.created,
|
||||
r.time,
|
||||
|
@ -7,7 +6,7 @@ SELECT
|
|||
v.tradeMark vehicleTradeMark,
|
||||
v.model vehicleModel,
|
||||
v.numberPlate plateNumber,
|
||||
IFNULL(s.name, am.name) AS agencyName
|
||||
IFNULL(s.name, am.name) agencyName
|
||||
FROM route r
|
||||
LEFT JOIN vehicle v ON v.id = r.vehicleFk
|
||||
LEFT JOIN worker w ON w.id = r.workerFk
|
||||
|
|
|
@ -1,20 +1,19 @@
|
|||
SELECT
|
||||
t.nickname addressName,
|
||||
SELECT t.nickname addressName,
|
||||
t.packages,
|
||||
t.priority,
|
||||
t.id,
|
||||
t.clientFk,
|
||||
t.companyFk,
|
||||
t.routeFk,
|
||||
if(a.phone, a.phone, c.phone) AS phone,
|
||||
if(a.mobile, a.mobile, c.mobile) AS mobile,
|
||||
if(a.phone, a.phone, c.phone) phone,
|
||||
if(a.mobile, a.mobile, c.mobile) mobile,
|
||||
wh.name warehouseName,
|
||||
a.city,
|
||||
a.street,
|
||||
a.postalCode,
|
||||
LPAD(a.id, 5, '0') AS addressFk,
|
||||
LPAD(a.id, 5, '0') addressFk,
|
||||
p.name province,
|
||||
0 AS import,
|
||||
0 import,
|
||||
am.name ticketAgency,
|
||||
tob.description,
|
||||
u.nickName salesPersonName,
|
||||
|
|
Loading…
Reference in New Issue