multiple bugfixes from 20 Apr 2020 to 7 jan 2023
This commit is contained in:
parent
902e04c7e6
commit
63d062c4a7
122 changed files with 13163 additions and 12361 deletions
|
|
@ -37,6 +37,7 @@ import { ContactService } from '../contact.service';
|
|||
import { TranslateService } from 'ng2-translate';
|
||||
import { MdDialog } from '@angular/material';
|
||||
import { DemoVideosComponent } from '../const/demo-videos/demo-videos.component';
|
||||
import { DatainjectionService } from '../datainjection.service';
|
||||
// import { PoiListComponent } from '../poi-list/poi-list.component';
|
||||
// import { PoiDtlDelComponent } from "../poi-dtl-del/poi-dtl-del.component";
|
||||
// import { MdDialog } from '@angular/material';
|
||||
|
|
@ -110,7 +111,7 @@ export class AllMenusComponent implements OnInit {
|
|||
adressTab: boolean=false;
|
||||
phone: any;
|
||||
// ,public dialog: MdDialog
|
||||
constructor(public dialog: MdDialog,private router: Router, private route: ActivatedRoute, private contactService: ContactService,public translate: TranslateService) {
|
||||
constructor(private _DatainjectionService: DatainjectionService,public dialog: MdDialog,private router: Router, private route: ActivatedRoute, private contactService: ContactService,public translate: TranslateService) {
|
||||
this.contactService.totalTicketCount.subscribe(totalTicketCount => {
|
||||
// this.ticketCount = totalTicketCount
|
||||
this.useridd = JSON.parse(window.atob(window.localStorage.token.split('.')[1]))._id;
|
||||
|
|
@ -146,7 +147,15 @@ export class AllMenusComponent implements OnInit {
|
|||
menuWidth:any;
|
||||
sup_admin:boolean;
|
||||
isOrgnaisation:boolean=false;
|
||||
urlspecifc:boolean =false;
|
||||
ngOnInit() {
|
||||
let domainName = window.location.host;
|
||||
console.log(domainName, 'domainName');
|
||||
if (domainName.indexOf('oneqlik') >= 0 || domainName.indexOf('localhost') >= 0) {
|
||||
this.urlspecifc = true
|
||||
} else {
|
||||
this.urlspecifc = false;
|
||||
}
|
||||
// console.log("Inside all app menu component---------------------------------------------");
|
||||
// this.superAdmin = JSON.parse(window.atob(window.localStorage.token.split(".")[1])).isSuperAdmin;
|
||||
if(localStorage.getItem('superadmin')=="ON"){
|
||||
|
|
@ -164,6 +173,7 @@ export class AllMenusComponent implements OnInit {
|
|||
// this.emailid = JSON.parse(window.atob(window.localStorage.token.split(".")[1])).email;
|
||||
this.or = JSON.parse(window.atob(window.localStorage.token.split(".")[1]))._orgName;
|
||||
this.superAdmin = JSON.parse(window.atob(window.localStorage.token.split(".")[1])).isSuperAdmin;
|
||||
|
||||
this.isOrganisation = JSON.parse(window.atob(window.localStorage.token.split(".")[1])).isOrganisation;
|
||||
this.mb = JSON.parse(window.atob(window.localStorage.token.split('.')[1])).phn;
|
||||
// // this.routePath = JSON.parse(localStorage.getItem('routeData'));
|
||||
|
|
@ -188,7 +198,7 @@ export class AllMenusComponent implements OnInit {
|
|||
|
||||
}
|
||||
|
||||
|
||||
this._DatainjectionService.refreshConnection();
|
||||
|
||||
// console.log("this.reportPrefrecne=>",this.reportPrefrecne);
|
||||
|
||||
|
|
@ -706,6 +716,7 @@ fuel_report(id){
|
|||
|
||||
logout() {
|
||||
window.localStorage.clear();
|
||||
this._DatainjectionService.closeConnection();
|
||||
this.router.navigateByUrl("login");
|
||||
}
|
||||
|
||||
|
|
@ -914,4 +925,10 @@ getLanguage(){
|
|||
toll(){
|
||||
this.router.navigate(['/toll'])
|
||||
}
|
||||
deviceSetting(id){
|
||||
this.router.navigate(['/device-setting'])
|
||||
}
|
||||
userSetting(id) {
|
||||
this.router.navigate(['/user-setting'])
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue