fixed nfc issues

MOHEMM-SFH-COLORS
umasoodch 5 years ago
parent 1424c27008
commit 077538efe5

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="com.cloudsolutions.mohemm" version="2.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="hmg.cloudSolutions.mohem" version="2.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>MOHEMM</name> <name>MOHEMM</name>
<description>an app created by cloud Solutions</description> <description>an app created by cloud Solutions</description>
<author email="eservicescs@cloudsolution-sa.com" href="http://cloudsolution-sa.com">Cloud Solutions</author> <author email="eservicescs@cloudsolution-sa.com" href="http://cloudsolution-sa.com">Cloud Solutions</author>
@ -144,6 +144,5 @@
<plugin name="cordova-plugin-fingerprint-aio" spec="^3.0.0"> <plugin name="cordova-plugin-fingerprint-aio" spec="^3.0.0">
<variable name="FACEID_USAGE_DESCRIPTION" value="User Authentication" /> <variable name="FACEID_USAGE_DESCRIPTION" value="User Authentication" />
</plugin> </plugin>
<engine name="browser" spec="5.0.4" />
<engine name="ios" spec="4.5.5" /> <engine name="ios" spec="4.5.5" />
</widget> </widget>

@ -3918,661 +3918,6 @@
} }
} }
}, },
"cordova-browser": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/cordova-browser/-/cordova-browser-5.0.4.tgz",
"integrity": "sha512-EDuG+9NGsaYpNSY6wF0kR34m1m38V+nRglGXxQ609fgMYrMHEYR2lg38nDr1Os4qeF0LJz8UQ7nq7Y+idg6Aig==",
"requires": {
"abbrev": "*",
"accepts": "*",
"ansi": "*",
"ansi-regex": "2.1.1",
"ansi-styles": "2.2.1",
"array-flatten": "1.1.1",
"balanced-match": "*",
"base64-js": "1.2.0",
"big-integer": "*",
"body-parser": "1.18.2",
"bplist-parser": "*",
"brace-expansion": "*",
"bytes": "*",
"chalk": "1.1.3",
"compressible": "*",
"compression": "1.7.2",
"concat-map": "*",
"content-disposition": "*",
"content-type": "*",
"cookie": "*",
"cookie-signature": "1.0.6",
"cordova-common": "2.2.5",
"cordova-registry-mapper": "*",
"cordova-serve": "2.0.1",
"debug": "2.6.9",
"depd": "*",
"destroy": "*",
"ee-first": "*",
"elementtree": "0.1.6",
"encodeurl": "*",
"escape-html": "*",
"escape-string-regexp": "*",
"etag": "*",
"express": "*",
"finalhandler": "*",
"forwarded": "*",
"fresh": "*",
"glob": "5.0.15",
"has-ansi": "2.0.0",
"http-errors": "1.6.3",
"iconv-lite": "0.4.19",
"inflight": "*",
"inherits": "*",
"ipaddr.js": "1.6.0",
"is-wsl": "*",
"media-typer": "*",
"merge-descriptors": "*",
"methods": "*",
"mime": "1.4.1",
"mime-db": "1.33.0",
"mime-types": "2.1.18",
"minimatch": "*",
"ms": "2.0.0",
"negotiator": "*",
"nopt": "3.0.6",
"on-finished": "*",
"on-headers": "*",
"once": "*",
"opn": "*",
"parseurl": "*",
"path-is-absolute": "*",
"path-to-regexp": "0.1.7",
"plist": "2.1.0",
"proxy-addr": "2.0.3",
"q": "*",
"qs": "6.5.1",
"range-parser": "*",
"raw-body": "2.3.2",
"safe-buffer": "5.1.1",
"sax": "0.3.5",
"send": "*",
"serve-static": "*",
"setprototypeof": "*",
"shelljs": "0.5.3",
"statuses": "1.4.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0",
"type-is": "*",
"underscore": "*",
"unorm": "*",
"unpipe": "*",
"utils-merge": "*",
"vary": "*",
"wrappy": "*",
"xmlbuilder": "8.2.2",
"xmldom": "*"
},
"dependencies": {
"abbrev": {
"version": "1.1.1",
"bundled": true
},
"accepts": {
"version": "1.3.5",
"bundled": true,
"requires": {
"mime-types": "~2.1.18",
"negotiator": "0.6.1"
}
},
"ansi": {
"version": "0.3.1",
"bundled": true
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true
},
"ansi-styles": {
"version": "2.2.1",
"bundled": true
},
"array-flatten": {
"version": "1.1.1",
"bundled": true
},
"balanced-match": {
"version": "1.0.0",
"bundled": true
},
"base64-js": {
"version": "1.2.0",
"bundled": true
},
"big-integer": {
"version": "1.6.32",
"bundled": true
},
"body-parser": {
"version": "1.18.2",
"bundled": true,
"requires": {
"bytes": "3.0.0",
"content-type": "~1.0.4",
"debug": "2.6.9",
"depd": "~1.1.1",
"http-errors": "~1.6.2",
"iconv-lite": "0.4.19",
"on-finished": "~2.3.0",
"qs": "6.5.1",
"raw-body": "2.3.2",
"type-is": "~1.6.15"
}
},
"bplist-parser": {
"version": "0.1.1",
"bundled": true,
"requires": {
"big-integer": "^1.6.7"
}
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
"bytes": {
"version": "3.0.0",
"bundled": true
},
"chalk": {
"version": "1.1.3",
"bundled": true,
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
}
},
"compressible": {
"version": "2.0.14",
"bundled": true,
"requires": {
"mime-db": ">= 1.34.0 < 2"
},
"dependencies": {
"mime-db": {
"version": "1.34.0",
"bundled": true
}
}
},
"compression": {
"version": "1.7.2",
"bundled": true,
"requires": {
"accepts": "~1.3.4",
"bytes": "3.0.0",
"compressible": "~2.0.13",
"debug": "2.6.9",
"on-headers": "~1.0.1",
"safe-buffer": "5.1.1",
"vary": "~1.1.2"
}
},
"concat-map": {
"version": "0.0.1",
"bundled": true
},
"content-disposition": {
"version": "0.5.2",
"bundled": true
},
"content-type": {
"version": "1.0.4",
"bundled": true
},
"cookie": {
"version": "0.3.1",
"bundled": true
},
"cookie-signature": {
"version": "1.0.6",
"bundled": true
},
"cordova-common": {
"version": "2.2.5",
"bundled": true,
"requires": {
"ansi": "^0.3.1",
"bplist-parser": "^0.1.0",
"cordova-registry-mapper": "^1.1.8",
"elementtree": "0.1.6",
"glob": "^5.0.13",
"minimatch": "^3.0.0",
"plist": "^2.1.0",
"q": "^1.4.1",
"shelljs": "^0.5.3",
"underscore": "^1.8.3",
"unorm": "^1.3.3"
}
},
"cordova-registry-mapper": {
"version": "1.1.15",
"bundled": true
},
"cordova-serve": {
"version": "2.0.1",
"bundled": true,
"requires": {
"chalk": "^1.1.1",
"compression": "^1.6.0",
"express": "^4.13.3",
"opn": "^5.3.0",
"shelljs": "^0.5.3"
}
},
"debug": {
"version": "2.6.9",
"bundled": true,
"requires": {
"ms": "2.0.0"
}
},
"depd": {
"version": "1.1.2",
"bundled": true
},
"destroy": {
"version": "1.0.4",
"bundled": true
},
"ee-first": {
"version": "1.1.1",
"bundled": true
},
"elementtree": {
"version": "0.1.6",
"bundled": true,
"requires": {
"sax": "0.3.5"
}
},
"encodeurl": {
"version": "1.0.2",
"bundled": true
},
"escape-html": {
"version": "1.0.3",
"bundled": true
},
"escape-string-regexp": {
"version": "1.0.5",
"bundled": true
},
"etag": {
"version": "1.8.1",
"bundled": true
},
"express": {
"version": "4.16.3",
"bundled": true,
"requires": {
"accepts": "~1.3.5",
"array-flatten": "1.1.1",
"body-parser": "1.18.2",
"content-disposition": "0.5.2",
"content-type": "~1.0.4",
"cookie": "0.3.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "~1.1.2",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"finalhandler": "1.1.1",
"fresh": "0.5.2",
"merge-descriptors": "1.0.1",
"methods": "~1.1.2",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"path-to-regexp": "0.1.7",
"proxy-addr": "~2.0.3",
"qs": "6.5.1",
"range-parser": "~1.2.0",
"safe-buffer": "5.1.1",
"send": "0.16.2",
"serve-static": "1.13.2",
"setprototypeof": "1.1.0",
"statuses": "~1.4.0",
"type-is": "~1.6.16",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
}
},
"finalhandler": {
"version": "1.1.1",
"bundled": true,
"requires": {
"debug": "2.6.9",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"statuses": "~1.4.0",
"unpipe": "~1.0.0"
}
},
"forwarded": {
"version": "0.1.2",
"bundled": true
},
"fresh": {
"version": "0.5.2",
"bundled": true
},
"glob": {
"version": "5.0.15",
"bundled": true,
"requires": {
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "2 || 3",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"has-ansi": {
"version": "2.0.0",
"bundled": true,
"requires": {
"ansi-regex": "^2.0.0"
}
},
"http-errors": {
"version": "1.6.3",
"bundled": true,
"requires": {
"depd": "~1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.0",
"statuses": ">= 1.4.0 < 2"
}
},
"iconv-lite": {
"version": "0.4.19",
"bundled": true
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
}
},
"inherits": {
"version": "2.0.3",
"bundled": true
},
"ipaddr.js": {
"version": "1.6.0",
"bundled": true
},
"is-wsl": {
"version": "1.1.0",
"bundled": true
},
"media-typer": {
"version": "0.3.0",
"bundled": true
},
"merge-descriptors": {
"version": "1.0.1",
"bundled": true
},
"methods": {
"version": "1.1.2",
"bundled": true
},
"mime": {
"version": "1.4.1",
"bundled": true
},
"mime-db": {
"version": "1.33.0",
"bundled": true
},
"mime-types": {
"version": "2.1.18",
"bundled": true,
"requires": {
"mime-db": "~1.33.0"
}
},
"minimatch": {
"version": "3.0.4",
"bundled": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"ms": {
"version": "2.0.0",
"bundled": true
},
"negotiator": {
"version": "0.6.1",
"bundled": true
},
"nopt": {
"version": "3.0.6",
"bundled": true,
"requires": {
"abbrev": "1"
}
},
"on-finished": {
"version": "2.3.0",
"bundled": true,
"requires": {
"ee-first": "1.1.1"
}
},
"on-headers": {
"version": "1.0.1",
"bundled": true
},
"once": {
"version": "1.4.0",
"bundled": true,
"requires": {
"wrappy": "1"
}
},
"opn": {
"version": "5.3.0",
"bundled": true,
"requires": {
"is-wsl": "^1.1.0"
}
},
"parseurl": {
"version": "1.3.2",
"bundled": true
},
"path-is-absolute": {
"version": "1.0.1",
"bundled": true
},
"path-to-regexp": {
"version": "0.1.7",
"bundled": true
},
"plist": {
"version": "2.1.0",
"bundled": true,
"requires": {
"base64-js": "1.2.0",
"xmlbuilder": "8.2.2",
"xmldom": "0.1.x"
}
},
"proxy-addr": {
"version": "2.0.3",
"bundled": true,
"requires": {
"forwarded": "~0.1.2",
"ipaddr.js": "1.6.0"
}
},
"q": {
"version": "1.5.1",
"bundled": true
},
"qs": {
"version": "6.5.1",
"bundled": true
},
"range-parser": {
"version": "1.2.0",
"bundled": true
},
"raw-body": {
"version": "2.3.2",
"bundled": true,
"requires": {
"bytes": "3.0.0",
"http-errors": "1.6.2",
"iconv-lite": "0.4.19",
"unpipe": "1.0.0"
},
"dependencies": {
"depd": {
"version": "1.1.1",
"bundled": true
},
"http-errors": {
"version": "1.6.2",
"bundled": true,
"requires": {
"depd": "1.1.1",
"inherits": "2.0.3",
"setprototypeof": "1.0.3",
"statuses": ">= 1.3.1 < 2"
}
},
"setprototypeof": {
"version": "1.0.3",
"bundled": true
}
}
},
"safe-buffer": {
"version": "5.1.1",
"bundled": true
},
"sax": {
"version": "0.3.5",
"bundled": true
},
"send": {
"version": "0.16.2",
"bundled": true,
"requires": {
"debug": "2.6.9",
"depd": "~1.1.2",
"destroy": "~1.0.4",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
"http-errors": "~1.6.2",
"mime": "1.4.1",
"ms": "2.0.0",
"on-finished": "~2.3.0",
"range-parser": "~1.2.0",
"statuses": "~1.4.0"
}
},
"serve-static": {
"version": "1.13.2",
"bundled": true,
"requires": {
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.2",
"send": "0.16.2"
}
},
"setprototypeof": {
"version": "1.1.0",
"bundled": true
},
"shelljs": {
"version": "0.5.3",
"bundled": true
},
"statuses": {
"version": "1.4.0",
"bundled": true
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"requires": {
"ansi-regex": "^2.0.0"
}
},
"supports-color": {
"version": "2.0.0",
"bundled": true
},
"type-is": {
"version": "1.6.16",
"bundled": true,
"requires": {
"media-typer": "0.3.0",
"mime-types": "~2.1.18"
}
},
"underscore": {
"version": "1.9.1",
"bundled": true
},
"unorm": {
"version": "1.4.1",
"bundled": true
},
"unpipe": {
"version": "1.0.0",
"bundled": true
},
"utils-merge": {
"version": "1.0.1",
"bundled": true
},
"vary": {
"version": "1.1.2",
"bundled": true
},
"wrappy": {
"version": "1.0.2",
"bundled": true
},
"xmlbuilder": {
"version": "8.2.2",
"bundled": true
},
"xmldom": {
"version": "0.1.27",
"bundled": true
}
}
},
"cordova-common": { "cordova-common": {
"version": "3.2.1", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.1.tgz", "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.1.tgz",

@ -65,7 +65,6 @@
"com-badrit-base64": "^0.2.0", "com-badrit-base64": "^0.2.0",
"cordova-android": "^8.1.0", "cordova-android": "^8.1.0",
"cordova-android-support-gradle-release": "^3.0.1", "cordova-android-support-gradle-release": "^3.0.1",
"cordova-browser": "5.0.4",
"cordova-ios": "4.5.5", "cordova-ios": "4.5.5",
"cordova-open-native-settings": "^1.5.2", "cordova-open-native-settings": "^1.5.2",
"cordova-opentok-android-permissions": "^1.0.1", "cordova-opentok-android-permissions": "^1.0.1",
@ -218,7 +217,6 @@
"phonegap-nfc": {} "phonegap-nfc": {}
}, },
"platforms": [ "platforms": [
"browser",
"ios", "ios",
"android" "android"
] ]

@ -24,8 +24,8 @@ export class ConnectorService {
public static timeOut = 120 * 1000; public static timeOut = 120 * 1000;
// public static host = 'http://10.50.100.113:6060/'; // development service // public static host = 'http://10.50.100.113:6060/'; // development service
public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/'; public static host = 'https://hmgwebservices.com/';
// public static host = 'http://10.50.100.198:6060/'; // public static host = 'http://10.50.100.198:6060/';
// public static host = 'http://10.50.100.113:6060/'; // development service // public static host = 'http://10.50.100.113:6060/'; // development service
/* public static host = 'http://10.50.100.198:6060/'; /* public static host = 'http://10.50.100.198:6060/';

@ -1,6 +1,6 @@
.attendance-grid { .attendance-grid {
padding-right: 20px; padding-right: 10px;
padding-left: 20px; padding-left: 10px;
} }
.nfc-clock { .nfc-clock {
text-align: center; text-align: center;
@ -17,7 +17,7 @@
margin-right: 15px !important; margin-right: 15px !important;
} }
.margin-col-right { .margin-col-right {
margin-right: 25px !important ; margin-right: 20px !important ;
} }
.textAndIcon{ .textAndIcon{

@ -23,6 +23,7 @@
color: #bbbbbb; color: #bbbbbb;
font-family: 'WorkSans-Bold'; font-family: 'WorkSans-Bold';
margin-top: -20%; margin-top: -20%;
padding-right: 10px;
} }
ion-button { ion-button {
--background: #282f42; --background: #282f42;

@ -877,11 +877,11 @@
}, },
"option-attendance": { "option-attendance": {
"en":"Attendance Options", "en":"Attendance Options",
"ar":"خيارات التبصيم" "ar":"خيارات تسجيل الحضور"
}, },
"select-attendance": { "select-attendance": {
"en": "Select Method to Mark your Attendance", "en": "Select Method to Mark your Attendance",
"ar": "حدد طريقة لتمييز الحضور الخاص بك" "ar": "اختر طريقة تسجيل الحضور"
}, },
"nfc-text": { "nfc-text": {
"en": "NFC", "en": "NFC",
@ -893,23 +893,23 @@
}, },
"nfc-settings": { "nfc-settings": {
"en": "Please enable NFC on your device", "en": "Please enable NFC on your device",
"ar": "يرجى تمكين NFC على جهازك" "ar": "يرجى تفعيل خاصية NFC على جهازك"
}, },
"nfc-error": { "nfc-error": {
"en": "NFC Scan Failed! Please try again", "en": "NFC Scan Failed! Please try again",
"ar": "فشل مسح NFC! حاول مرة اخرى" "ar": "فشل عملية التسجيل، حاول مرة اخرى"
}, },
"nfc-detect": { "nfc-detect": {
"en": "Detecting NFC to mark attendance", "en": "Put the back of your device on the NFC board",
"ar": "الكشف عن NFC للاحتفال بالحضور" "ar": "ضع الجزء الخلفي من جهازك على لوحة NFC"
}, },
"nfc-swipe-done": { "nfc-swipe-done": {
"en": "Swipe Attendance Done!", "en": "Swipe Attendance Done",
"ar": "انتقد الحضور!" "ar": "تم تسجيل الحضور بنجاح"
}, },
"nfc-detect-2": { "nfc-detect-2": {
"en": "Keep device close to NFC spot", "en": "Swipe the device close to the NFC marker on the board",
"ar": "احتفظ بالجهاز بالقرب من بقعة NFC" "ar": "قم بتمرير الجهاز بالقرب من علامة NFC الموجودة على اللوحة"
}, },
"nfc-cancel": { "nfc-cancel": {
"en": "CANCEL", "en": "CANCEL",

@ -1377,7 +1377,7 @@ border:0px
} }
.nfc-modal { .nfc-modal {
--height: 11cm !important; --height: 12cm !important;
--width: 90% !important; --width: 90% !important;
--border-radius: 0.4cm; --border-radius: 0.4cm;
} }

Loading…
Cancel
Save