fixed multiple popup issues

mekawy-issues
umasoodch 6 years ago
parent bf317e7274
commit 270506a31c

@ -5,15 +5,15 @@ import { SharedDataService } from '../shared-data-service/shared-data.service';
import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx';
import { AttendanceService } from 'src/app/home/services/attendance.services'; import { AttendanceService } from 'src/app/home/services/attendance.services';
import { ZBar } from '@ionic-native/zbar/ngx'; import { ZBar } from '@ionic-native/zbar/ngx';
import { Geolocation } from "@ionic-native/geolocation/ngx"; import { Geolocation } from '@ionic-native/geolocation/ngx';
import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request'; import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request';
import { AuthenticatedUser } from '../authentication/models/authenticated-user'; import { AuthenticatedUser } from '../authentication/models/authenticated-user';
import { CommonService } from '../common/common.service'; import { CommonService } from '../common/common.service';
import { TranslatorService } from '../translator/translator.service'; import { TranslatorService } from '../translator/translator.service';
import { Response } from "src/app/hmg-common/services/models/response"; import { Response } from 'src/app/hmg-common/services/models/response';
import { Camera, CameraOptions,PictureSourceType} from "@ionic-native/Camera/ngx"; import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service' import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service';
import { Device } from "@ionic-native/device/ngx"; import { Device } from '@ionic-native/device/ngx';
@Injectable({ @Injectable({
@ -28,50 +28,49 @@ export class AttendScanService {
scannedResult: any; scannedResult: any;
userData: any = {}; userData: any = {};
constructor(private device: Device, constructor(private device: Device,
private zbar: ZBar, private zbar: ZBar,
private geolocation: Geolocation, private geolocation: Geolocation,
private attendance_service: AttendanceService, private attendance_service: AttendanceService,
private barcodeScanner: BarcodeScanner, private barcodeScanner: BarcodeScanner,
private cameraController: Camera, private cameraController: Camera,
public sharedData: SharedDataService, public sharedData: SharedDataService,
private sanitizer: DomSanitizer, private sanitizer: DomSanitizer,
private permissions: DevicePermissionsService, private permissions: DevicePermissionsService,
public common:CommonService, public common: CommonService,
public ts: TranslatorService,) { public ts: TranslatorService, ) {
this.userData =this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false);
} }
public getDeviceLocation() { public getDeviceLocation() {
let isVirtual = this.device.isVirtual; const isVirtual = this.device.isVirtual;
if(isVirtual==true){ // tslint:disable-next-line: triple-equals
alert("emulater>>>>>>>"+isVirtual); if (isVirtual == true) {
alert("You are using virtual device"); alert('emulater>>>>>>>' + isVirtual);
alert('You are using virtual device');
return false; return false;
} }
this.permissions.requestLocationAutherization().then(granted => { this.permissions.requestLocationAutherization().then(granted => {
this.location = granted as boolean; this.location = granted as boolean;
if (this.location) { if (this.location) {
this.geolocation this.geolocation
.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }) .getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true })
.then(resp => { .then(resp => {
// console.log(resp.coords.latitude);
// console.log(resp.coords.longitude);
this.lat = resp.coords.latitude; this.lat = resp.coords.latitude;
this.longt = resp.coords.longitude; this.longt = resp.coords.longitude;
this.attendance(); this.attendance();
}) })
.catch(error => { .catch(error => {
console.log("Error getting location", error); console.log('Error getting location', error);
}); });
} else { } else {
return false; return false;
} }
}); });
} }
public attendance() { public attendance() {
this.permissions.requestCameraAutherization().then(granted => { this.permissions.requestCameraAutherization().then(granted => {
this.camera = granted as boolean; this.camera = granted as boolean;
@ -81,43 +80,43 @@ export class AttendScanService {
} }
); );
} }
public scanCode() { public scanCode() {
this.barcodeScanner.scan().then(barcodeData => { this.barcodeScanner.scan().then(barcodeData => {
console.log('Barcode data', barcodeData); if (!barcodeData.cancelled) {
// let strResult = JSON.parse(barcodeData); this.scannedResult = barcodeData;
// console.log(strResult.QRValue); this.deviceID = this.device.uuid;
this.scannedResult = barcodeData; this.swipeAttendance();
this.deviceID = this.device.uuid; }
this.swipeAttendance();
}).catch(err => { }).catch(err => {
console.log('Error', err); console.log('Error', err);
}); });
} }
public swipeAttendance() { public swipeAttendance() {
let request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
request.Latitude = this.lat; request.Latitude = this.lat;
request.Longitude = this.longt; request.Longitude = this.longt;
request.QRValue = this.scannedResult.text; request.QRValue = this.scannedResult.text;
request.UID = this.deviceID; request.UID = this.deviceID;
request.UserName = this.userData.EMPLOYEE_NUMBER; request.UserName = this.userData.EMPLOYEE_NUMBER;
console.log("request"); console.log('request');
console.log(JSON.stringify(request)); console.log(JSON.stringify(request));
this.attendance_service this.attendance_service
.attendanceSwipeScanner(request, () => { .attendanceSwipeScanner(request, () => {
console.log("Error inside in swipe attendance"); console.log('Error inside in swipe attendance');
}) })
.subscribe((result: Response) => { .subscribe((result: Response) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
console.log("response"); console.log('response');
console.log(result); console.log(result);
this.common.presentAlert(this.ts.trPK("home", "swipeAlertSuccess")); this.common.presentAlert(this.ts.trPK('home', 'swipeAlertSuccess'));
} else {
this.common.presentAlert(this.ts.trPK("home", "swipeAlertFailed"));
} }
// else {
// this.common.presentAlert(this.ts.trPK("home", "swipeAlertFailed"));
// }
}); });
} }
} }

Loading…
Cancel
Save