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

22
src/app/dialog-content-example-dialog/dialog-content-example-dialog.component.ts
View file

@ -548,7 +548,11 @@ export class DialogContentExampleDialogComponent implements OnInit {
}
showDate:boolean=false;
removeSpecialChar() {
if (this.deviceid) {
this.deviceid = this.deviceid.replaceAll(/[^0-9 ]/g, "").replaceAll(' ', '');
}
}
addDevice(btnindex) {
console.log("In addDevice");
@ -606,9 +610,20 @@ console.log("1");
// console.log("userDetailTopass",this.userDetail._id);
// console.log("vehdata",this.vehType._id)
//this._flashMessagesService.show('Congratulation Device Added as '+this.deviceid, { cssClass: 'alert-success', timeout: 2000 });
let expDateObj ;
if (this.expDate) {
expDateObj = new Date(this.expDate);
} else {
var eDate = new Date();
var LifeTimeyear = eDate.getFullYear() + 5;
eDate.setFullYear(LifeTimeyear);
expDateObj = new Date(eDate);
}
this.newDevice = {
devicename: this.devicename,
deviceid: this.deviceid,
deviceid: this.deviceid ? this.deviceid.replaceAll(/[^0-9]/g, "") : this.deviceid,
des: this.des,
model: this.model,
hrdwr: this.hrdwr,
@ -622,7 +637,7 @@ console.log("1");
driver_name: this.driver,
contact_number: this.dcontact,
device_model: this.DeviceModelValue,
expdate: new Date(this.expDate),
expdate: expDateObj,
License : this.licenseVal,
deviceDistanceVariation:this.selcetedSign+(this.deviceDistanceVariation?this.deviceDistanceVariation:'0')
@ -1835,6 +1850,7 @@ onUpload(imgIndex) {
failedReason:any;
failedUploadFiles:any;
uploadExcel(){
console.log("Device Json Payload",this.uploadJSON);
this.failedUploadFiles = [];
this.Load =true;