vivek/OneQlik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

multiple bugfixes from 20 Apr 2020 to 7 jan 2023

Browse source
This commit is contained in:
Pranav 2023-01-07 17:09:46 +00:00
parent 902e04c7e6
commit 63d062c4a7
122 changed files with 13163 additions and 12361 deletions
Download patch file Download diff file Expand all files Collapse all files

118
src/app/device/edit-device-master/edit-device-master.component.ts
View file

@ -58,7 +58,7 @@ deletetemplate:boolean=false;
dealerAddress: any;
CID_No: any;
imgUrl: any;
imgURL: any;
imgURL: any = '';
companyName: any;
companyAddress: any;
transportOfficeCity: any;
@ -93,19 +93,19 @@ deletetemplate:boolean=false;
this.getUser();
this.dealerDetail();
console.log("DATA",this.data);
this.lastDeviceTime=this.data.deviceInfo.last_device_time;
this.lastPingOn=this.data.deviceInfo.last_ping_on
this.devName = this.data.deviceInfo.Device_Name;
this.lastDeviceTime = this.data.deviceInfo.last_device_time ? this.data.deviceInfo.last_device_time:'';
this.lastPingOn = this.data.deviceInfo.last_ping_on ? this.data.deviceInfo.last_ping_on:''
this.devName = this.data.deviceInfo.Device_Name ? this.data.deviceInfo.Device_Name:'';
this.devID = this.data.deviceInfo.Device_ID?this.data.deviceInfo.Device_ID:"";
this.phNum =this.data.deviceInfo.contact_number;
this.phNum = this.data.deviceInfo.contact_number ? this.data.deviceInfo.contact_number:'';
this.createdOn = this.data.deviceInfo.created_on?(new Date(this.data.deviceInfo.created_on).toISOString()):"";
this.expOn = this.data.deviceInfo.expiration_date?(new Date(this.data.deviceInfo.expiration_date).toISOString()):"";
// this.iconType=this.data.deviceInfo.iconType;
this.simNum =this.data.deviceInfo.sim_number;
this.orignalEmail = this.data.deviceInfo.Email_ID
this.emailId = this.data.deviceInfo.Email_ID;
this.deviceImage=this.data.deviceInfo.deviceImage
this.simNum = this.data.deviceInfo.sim_number ? this.data.deviceInfo.sim_number:'';
this.orignalEmail = this.data.deviceInfo.Email_ID ? this.data.deviceInfo.Email_ID:''
this.emailId = this.data.deviceInfo.Email_ID ? this.data.deviceInfo.Email_ID:'';
this.deviceImage = this.data.deviceInfo.deviceImage ? this.data.deviceInfo.deviceImage:''
this.deviceImage = this.deviceImage.filter(dFilter=>dFilter);
for(var i=0;i<this.deviceImage.length;i++){
this.deviceImage[i] = 'https://www.oneqlik.in' + this.deviceImage[i].substring(6)
@ -113,29 +113,29 @@ deletetemplate:boolean=false;
}
console.log(this.deviceImage);
this.todayODO=this.data.deviceInfo.today_odo;
this.totalODO =this.data.deviceInfo.total_odo;
this.deviceID = this.data.deviceInfo._id;
this.initialUser = this.data.deviceInfo.user._id;
this.todayODO = this.data.deviceInfo.today_odo ? this.data.deviceInfo.today_odo:0;
this.totalODO = this.data.deviceInfo.total_odo ? this.data.deviceInfo.total_odo:0;
this.deviceID = this.data.deviceInfo._id ? this.data.deviceInfo._id:'';
this.initialUser = this.data.deviceInfo.user._id ? this.data.deviceInfo.user._id:'';
this.userName = this.data.deviceInfo.OwnerName;
this.userName = this.data.deviceInfo.OwnerName ? this.data.deviceInfo.OwnerName:'';
this.userAddress = this.data.deviceInfo?this.data.deviceInfo.user.address:"";
this.dealerName = this.data.deviceInfo.Dealer_name ;
this.dealerName = this.data.deviceInfo.Dealer_name ? this.data.deviceInfo.Dealer_name:'' ;
this.dealerId = this.data.deviceInfo.Dealer?this.data.deviceInfo.Dealer._id : "";
console.log('this.dealerId',this.dealerId);
this.dealerAddress = this.data.deviceInfo.DealerAddress;
this.dealerAddress = this.data.deviceInfo.DealerAddress ? this.data.deviceInfo.DealerAddress:'';
this.InvoiceDate = this.data.deviceInfo.invoiceDate?(new Date(this.data.deviceInfo.invoiceDate).toISOString()):"";
this.invoiceNum = this.data.deviceInfo.invoiceNumber
this.CID_No = this.data.deviceInfo.CID_No
this.invoiceNum = this.data.deviceInfo.invoiceNumber ? this.data.deviceInfo.invoiceNumber:''
this.CID_No = this.data.deviceInfo.CID_No ? this.data.deviceInfo.CID_No:''
this.devicetype = this.data.deviceInfo.device_model?this.data.deviceInfo.device_model.device_type:"";
this.ICCICD = this.data.deviceInfo.ICCICD;
this.IMSI = this.data.deviceInfo.IMSI;
this.uniqueID = this.data.deviceInfo.uniqueID;
this.ICCICD = this.data.deviceInfo.ICCICD ? this.data.deviceInfo.ICCICD:'';
this.IMSI = this.data.deviceInfo.IMSI ? this.data.deviceInfo.IMSI:'';
this.uniqueID = this.data.deviceInfo.uniqueID? this.data.deviceInfo.uniqueID:"";
this.fitmentDate = this.data.deviceInfo.fitmentDate?new Date(this.data.deviceInfo.fitmentDate):"";
this.expiration_date =this.data.deviceInfo.expiration_date?new Date(this.data.deviceInfo.expiration_date):"";
this.engineNo = this.data.deviceInfo.engineNo;
this.typeOfVehicle = this.data.deviceInfo.typeOfVehicle;
this.manufacturingCompany = this.data.deviceInfo.manufacturingCompany;
this.engineNo = this.data.deviceInfo.engineNo ? this.data.deviceInfo.engineNo:'';
this.typeOfVehicle = this.data.deviceInfo.typeOfVehicle ? this.data.deviceInfo.typeOfVehicle:'';
this.manufacturingCompany = this.data.deviceInfo.manufacturingCompany ? this.data.deviceInfo.manufacturingCompany:'';
this.lastFitnessDate = this.data.deviceInfo.lastFitnessDate?new Date(this.data.deviceInfo.lastFitnessDate):"";
this.vehicleRegDate = this.data.deviceInfo.vehicleRegDate? new Date(this.data.deviceInfo.vehicleRegDate):"";
@ -145,13 +145,13 @@ deletetemplate:boolean=false;
// console.log(this.CID_No,this.devicetype,this.ICCICD,this.IMSI,this.uniqueID,this.fitmentDate,this.engineNo,this.typeOfVehicle,this.manufacturingCompany);
// console.log(this.lastFitnessDate,this.vehicleRegDate,this.vehicleManufacturingDate,this.lattitude,this.longitude)
if(this.data.deviceInfo['actionId']=="exportPdf"){
this.companyName = this.data.deviceInfo.companyName;
this.companyAddress = this.data.deviceInfo.companyAddress;
this.transportOfficeCity = this.data.deviceInfo.transportOfficeCity;
this.transportOfficeState = this.data.deviceInfo.transportOfficeState;
this.ChassisNo = this.data.deviceInfo.ChassisNo;
this.companyName = this.data.deviceInfo.companyName ? this.data.deviceInfo.companyName:'';
this.companyAddress = this.data.deviceInfo.companyAddress ? this.data.deviceInfo.companyAddress:'';
this.transportOfficeCity = this.data.deviceInfo.transportOfficeCity ? this.data.deviceInfo.transportOfficeCity:'';
this.transportOfficeState = this.data.deviceInfo.transportOfficeState ? this.data.deviceInfo.transportOfficeState:'';
this.ChassisNo = this.data.deviceInfo.ChassisNo ? this.data.deviceInfo.ChassisNo:'';
this.deviceManufacturer = this.data.deviceInfo.device_model?this.data.deviceInfo.device_model.Manufacturer:"";
this.numberOfSOS = this.data.deviceInfo.numberOfSOS;
this.numberOfSOS = this.data.deviceInfo.numberOfSOS ? this.data.deviceInfo.numberOfSOS:'';
this.editTemplate =false;
this.deletetemplate = false;
this.ExportPdf =true;
@ -433,15 +433,15 @@ filterDistStates(dst){
var myImage = new Image();
myImage.src = that.deviceImage[0]?that.deviceImage[0]:'';
myImage.src = that.deviceImage[0] && that.deviceImage[0] !='' ?that.deviceImage[0]:'';
myImage.crossOrigin="anonymous";
var myImage1 = new Image();
myImage1.src = that.deviceImage[1]?that.deviceImage[1]:'';
myImage1.src = that.deviceImage[1] && that.deviceImage[1] != '' ?that.deviceImage[1]:'';
myImage1.crossOrigin="anonymous";
var myImage2 = new Image();
myImage2.src = that.deviceImage[2]?that.deviceImage[2]:'';
myImage2.src = that.deviceImage[2] && that.deviceImage[2] != '' ?that.deviceImage[2]:'';
myImage2.crossOrigin="anonymous";
if(that.deviceImage.length==0){
@ -450,38 +450,48 @@ filterDistStates(dst){
function f1() {
return new Promise((resolve, reject) => {
myImage.onload = function(){
console.log("1");
doc.addImage(myImage , 'png', 40, 180, 30, 20);
if(that.deviceImage.length==1){
doc.save('sample-file.pdf');
if(myImage.src) {
myImage.onload = function () {
console.log("1");
doc.setPage(1);
doc.addImage(myImage, 'png', 160, 213, 20, 20);
if (that.deviceImage.length == 1) {
doc.save('sample-file.pdf');
}
};
}
};
resolve('');
});
}
function f3(){
myImage2.onload = function(){
console.log("3");
doc.addImage(myImage2 , 'png', 80, 180, 30, 20);
doc.save('sample-file.pdf');
};
if (myImage2) {
myImage2.onload = function () {
console.log("3");
doc.setPage(1);
doc.addImage(myImage2, 'png', 100, 213, 20, 20);
doc.save('sample-file.pdf');
};
}
}
function f2() {
return new Promise((resolve, reject) => {
myImage1.onload = function(){
if (myImage1) {
myImage1.onload = function () {
console.log("2");
doc.addImage(myImage1 , 'png', 60, 180, 30, 20);
if(that.deviceImage.length==2){
doc.save('sample-file.pdf');
}
doc.setPage(1);
doc.addImage(myImage1, 'png', 130, 213, 20, 20);
if (that.deviceImage.length == 2) {
doc.save('sample-file.pdf');
}
};
}
resolve('');
})