no message
This commit is contained in:
Kittapath
parent
08f2c8753e
commit
1c55c76741
2 changed files with 87 additions and 47 deletions
|
|
@ -207,11 +207,11 @@ export class ReportController extends Controller {
|
|||
.map(async (posMaster) => {
|
||||
let posMasterOld: any = null;
|
||||
if (posMaster.next_holder != null) {
|
||||
posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
posMasOld.current_holder == null
|
||||
? false
|
||||
: posMasOld.current_holder.id === posMaster.next_holder.id,
|
||||
);
|
||||
// posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
// posMasOld.current_holder == null
|
||||
// ? false
|
||||
// : posMasOld.current_holder.id === posMaster.next_holder.id,
|
||||
// );
|
||||
}
|
||||
let positionOld: any = null;
|
||||
if (posMasterOld != null)
|
||||
|
|
@ -222,10 +222,10 @@ export class ReportController extends Controller {
|
|||
posMasterNoPrefix: posMaster.posMasterNoPrefix,
|
||||
posMasterNo: posMaster.posMasterNo,
|
||||
posMasterNoSuffix: posMaster.posMasterNoSuffix,
|
||||
profileFullname:
|
||||
posMaster.next_holder == null
|
||||
? null
|
||||
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
// profileFullname:
|
||||
// posMaster.next_holder == null
|
||||
// ? null
|
||||
// : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
profilePosMasterNo: posMasterOld == null ? null : posMasterOld.posMasterNo,
|
||||
profilePositionName: positionOld == null ? null : positionOld.positionName,
|
||||
profilePosType: positionOld == null ? null : positionOld.posType.posTypeName,
|
||||
|
|
@ -268,11 +268,11 @@ export class ReportController extends Controller {
|
|||
.map(async (posMaster) => {
|
||||
let posMasterOld: any = null;
|
||||
if (posMaster.next_holder != null) {
|
||||
posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
posMasOld.current_holder == null
|
||||
? false
|
||||
: posMasOld.current_holder.id === posMaster.next_holder.id,
|
||||
);
|
||||
// posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
// posMasOld.current_holder == null
|
||||
// ? false
|
||||
// : posMasOld.current_holder.id === posMaster.next_holder.id,
|
||||
// );
|
||||
}
|
||||
let positionOld: any = null;
|
||||
if (posMasterOld != null)
|
||||
|
|
@ -283,10 +283,10 @@ export class ReportController extends Controller {
|
|||
posMasterNoPrefix: posMaster.posMasterNoPrefix,
|
||||
posMasterNo: posMaster.posMasterNo,
|
||||
posMasterNoSuffix: posMaster.posMasterNoSuffix,
|
||||
fullname:
|
||||
posMaster.next_holder == null
|
||||
? null
|
||||
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
// fullname:
|
||||
// posMaster.next_holder == null
|
||||
// ? null
|
||||
// : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
profilePosMasterNo:
|
||||
posMasterOld == null ? null : posMasterOld.posMasterNo,
|
||||
profilePositionName:
|
||||
|
|
@ -335,11 +335,11 @@ export class ReportController extends Controller {
|
|||
.map(async (posMaster) => {
|
||||
let posMasterOld: any = null;
|
||||
if (posMaster.next_holder != null) {
|
||||
posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
posMasOld.current_holder == null
|
||||
? false
|
||||
: posMasOld.current_holder.id === posMaster.next_holder.id,
|
||||
);
|
||||
// posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
// posMasOld.current_holder == null
|
||||
// ? false
|
||||
// : posMasOld.current_holder.id === posMaster.next_holder.id,
|
||||
// );
|
||||
}
|
||||
let positionOld: any = null;
|
||||
if (posMasterOld != null)
|
||||
|
|
@ -350,10 +350,10 @@ export class ReportController extends Controller {
|
|||
posMasterNoPrefix: posMaster.posMasterNoPrefix,
|
||||
posMasterNo: posMaster.posMasterNo,
|
||||
posMasterNoSuffix: posMaster.posMasterNoSuffix,
|
||||
fullname:
|
||||
posMaster.next_holder == null
|
||||
? null
|
||||
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
// fullname:
|
||||
// posMaster.next_holder == null
|
||||
// ? null
|
||||
// : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
profilePosMasterNo:
|
||||
posMasterOld == null ? null : posMasterOld.posMasterNo,
|
||||
profilePositionName:
|
||||
|
|
@ -404,12 +404,12 @@ export class ReportController extends Controller {
|
|||
.map(async (posMaster) => {
|
||||
let posMasterOld: any = null;
|
||||
if (posMaster.next_holder != null) {
|
||||
posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
posMasOld.current_holder == null
|
||||
? false
|
||||
: posMasOld.current_holder.id ===
|
||||
posMaster.next_holder.id,
|
||||
);
|
||||
// posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
// posMasOld.current_holder == null
|
||||
// ? false
|
||||
// : posMasOld.current_holder.id ===
|
||||
// posMaster.next_holder.id,
|
||||
// );
|
||||
}
|
||||
let positionOld: any = null;
|
||||
if (posMasterOld != null)
|
||||
|
|
@ -421,10 +421,10 @@ export class ReportController extends Controller {
|
|||
posMasterNoPrefix: posMaster.posMasterNoPrefix,
|
||||
posMasterNo: posMaster.posMasterNo,
|
||||
posMasterNoSuffix: posMaster.posMasterNoSuffix,
|
||||
fullname:
|
||||
posMaster.next_holder == null
|
||||
? null
|
||||
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
// fullname:
|
||||
// posMaster.next_holder == null
|
||||
// ? null
|
||||
// : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
profilePosMasterNo:
|
||||
posMasterOld == null ? null : posMasterOld.posMasterNo,
|
||||
profilePositionName:
|
||||
|
|
@ -483,12 +483,12 @@ export class ReportController extends Controller {
|
|||
.map(async (posMaster) => {
|
||||
let posMasterOld: any = null;
|
||||
if (posMaster.next_holder != null) {
|
||||
posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
posMasOld.current_holder == null
|
||||
? false
|
||||
: posMasOld.current_holder.id ===
|
||||
posMaster.next_holder.id,
|
||||
);
|
||||
// posMasterOld = posMasterOlds.find((posMasOld) =>
|
||||
// posMasOld.current_holder == null
|
||||
// ? false
|
||||
// : posMasOld.current_holder.id ===
|
||||
// posMaster.next_holder.id,
|
||||
// );
|
||||
}
|
||||
let positionOld: any = null;
|
||||
if (posMasterOld != null)
|
||||
|
|
@ -500,10 +500,10 @@ export class ReportController extends Controller {
|
|||
posMasterNoPrefix: posMaster.posMasterNoPrefix,
|
||||
posMasterNo: posMaster.posMasterNo,
|
||||
posMasterNoSuffix: posMaster.posMasterNoSuffix,
|
||||
fullname:
|
||||
posMaster.next_holder == null
|
||||
? null
|
||||
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
// fullname:
|
||||
// posMaster.next_holder == null
|
||||
// ? null
|
||||
// : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
|
||||
profilePosMasterNo:
|
||||
posMasterOld == null
|
||||
? null
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue