diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1032b29b..79bc3dc4 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -76,13 +76,21 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
index 8b73b0c7..e67f646f 100644
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/MainActivity.kt
@@ -2,8 +2,7 @@ package com.cloud.diplomaticquarterapp
import android.os.Bundle
import android.util.Log
import androidx.annotation.NonNull;
-import com.cloud.diplomaticquarterapp.utils.FlutterText
-import com.cloud.diplomaticquarterapp.utils.PlatformBridge
+import com.cloud.diplomaticquarterapp.utils.*
import io.flutter.embedding.android.FlutterFragmentActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugin.common.MethodChannel
@@ -15,6 +14,16 @@ class MainActivity: FlutterFragmentActivity() {
// Create Flutter Platform Bridge
PlatformBridge(flutterEngine.dartExecutor.binaryMessenger, this).create()
+ val time = timeToMillis("04:00:00", "HH:mm:ss")
+ print(time)
+
+// val d1 = Logs.list(this)
+// val d2 = Logs.raw(this)
+// val d3 = Logs.RegisterGeofence.list(this)
+// val d4 = Logs.RegisterGeofence.raw(this)
+// val d5 = Logs.GeofenceEvent.list(this)
+// val d6 = Logs.GeofenceEvent.raw(this)
+ print("")
}
override fun onResume() {
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeoZoneModel.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeoZoneModel.kt
index 7eba1ead..b3fb4f56 100644
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeoZoneModel.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeoZoneModel.kt
@@ -37,6 +37,7 @@ class GeoZoneModel {
val rad = Radius.toFloat()
if(lat != null && long != null){
+ val loiteringDelayMinutes:Int = 2 // in Minutes
return Geofence.Builder()
.setRequestId(identifier())
.setCircularRegion(
@@ -45,7 +46,8 @@ class GeoZoneModel {
rad
)
.setTransitionTypes(GeofenceTransition.ENTER_EXIT.value)
-// .setNotificationResponsiveness(0)
+ .setNotificationResponsiveness(0)
+ .setLoiteringDelay(loiteringDelayMinutes * 60 * 1000)
.setExpirationDuration(Geofence.NEVER_EXPIRE)
.build()
}
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceBroadcastReceiver.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceBroadcastReceiver.kt
deleted file mode 100644
index 8fc1faae..00000000
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceBroadcastReceiver.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-package com.cloud.diplomaticquarterapp.geofence
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-
-class GeofenceBroadcastReceiver : BroadcastReceiver() {
- override fun onReceive(context: Context, intent: Intent) {
- GeofenceTransitionsJobIntentService.enqueueWork(context, intent)
- }
-}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/HMG_Geofence.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/HMG_Geofence.kt
index 4d2c48b3..840075eb 100644
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/HMG_Geofence.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/HMG_Geofence.kt
@@ -6,7 +6,11 @@ import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.content.pm.PackageManager
+import android.location.Location
import androidx.core.content.ContextCompat
+import com.cloud.diplomaticquarterapp.geofence.intent_receivers.GeofenceBroadcastReceiver
+import com.cloud.diplomaticquarterapp.geofence.intent_receivers.ReregisterGeofenceJobService
+import com.cloud.diplomaticquarterapp.utils.*
import com.google.android.gms.location.Geofence
import com.google.android.gms.location.GeofencingClient
import com.google.android.gms.location.GeofencingRequest
@@ -17,8 +21,10 @@ import com.google.gson.reflect.TypeToken
enum class GeofenceTransition(val value: Int) {
ENTER(1),
EXIT(2),
+ DWELL(4),
+
ENTER_EXIT((ENTER.value or EXIT.value)),
- DWELL(4);
+ DWELL_EXIT((DWELL.value or EXIT.value));
companion object {
fun fromInt(value: Int) = GeofenceTransition.values().first { it.value == value }
@@ -27,17 +33,13 @@ enum class GeofenceTransition(val value: Int) {
fun named():String{
if (value == 1)return "Enter"
if (value == 2)return "Exit"
- if (value == (ENTER.value or EXIT.value))return "Enter or Exit"
if (value == 4)return "dWell"
+ if (value == (ENTER.value or EXIT.value))return "Enter or Exit"
+ if (value == (DWELL.value or EXIT.value))return "DWell or Exit"
return "unknown"
}
}
-const val PREFS_STORAGE = "FlutterSharedPreferences"
-const val PREF_KEY_SUCCESS = "HMG_GEOFENCE_SUCCESS"
-const val PREF_KEY_FAILED = "HMG_GEOFENCE_FAILED"
-const val PREF_KEY_HMG_ZONES = "flutter.hmg-geo-fences"
-
class HMG_Geofence {
// https://developer.android.com/training/location/geofencing#java
@@ -69,13 +71,53 @@ class HMG_Geofence {
}
}
- fun register(geoZones: List){
+ fun limitize(zones: List):List{
+ var geoZones_ = zones
+ if(zones.size > 100)
+ geoZones_ = zones.subList(0, 99)
+ return geoZones_
+ }
+
+
+ fun register(completion:((Boolean, java.lang.Exception?)->Unit)){
+ unRegisterAll { status, exception ->
+ val geoZones = getGeoZonesFromPreference(context)
+ doRegister(geoZones){ status_, error ->
+ completion.let { it(status_, error) }
+ }
+ }
+ }
+
+ fun unRegisterAll(completion: (status: Boolean, exception: Exception?) -> Unit){
+ getActiveGeofences({ success ->
+ removeActiveGeofences()
+ if(success.isNotEmpty())
+ geofencingClient
+ .removeGeofences(success)
+ .addOnSuccessListener {
+ completion(true, null)
+ }
+ .addOnFailureListener {
+ completion(false, it)
+ saveLog(context, "error:REMOVE_GEOFENCES", it.localizedMessage)
+ }
+ else
+ completion(true, null)
+
+ }, { failed ->
+ // Nothing to do with failed geofences.
+ })
+ }
+
+ private fun doRegister(geoZones: List, completion:((Boolean, java.lang.Exception?)->Unit)? = null){
if (geoZones.isEmpty())
return
+ val geoZones_ = limitize(geoZones)
+
fun buildGeofencingRequest(geofences: List): GeofencingRequest {
return GeofencingRequest.Builder()
- .setInitialTrigger(0)
+ .setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_DWELL)
.addGeofences(geofences)
.build()
}
@@ -83,9 +125,9 @@ class HMG_Geofence {
getActiveGeofences({ active ->
val geofences = mutableListOf()
- geoZones.forEach {
- it.toGeofence()?.let { geof ->
- if(!active.contains(geof.requestId)){ // if not already registered then register
+ geoZones_.forEach {
+ it.toGeofence()?.let { geof ->
+ if (!active.contains(geof.requestId)) { // if not already registered then register
geofences.add(geof)
}
}
@@ -95,31 +137,29 @@ class HMG_Geofence {
geofencingClient
.addGeofences(buildGeofencingRequest(geofences), geofencePendingIntent)
.addOnSuccessListener {
+ Logs.RegisterGeofence.save(context,"SUCCESS", "Successfuly registered the geofences", Logs.STATUS.SUCCESS)
saveActiveGeofence(geofences.map { it.requestId }, listOf())
+ completion?.let { it(true,null) }
}
- .addOnFailureListener {
- print(it.localizedMessage)
+ .addOnFailureListener { exc ->
+ Logs.RegisterGeofence.save(context,"FAILED_TO_REGISTER", "Failed to register geofence",Logs.STATUS.ERROR)
+ completion?.let { it(false,exc) }
}
+
+ // Schedule the job to register after specified duration (due to: events not calling after long period.. days or days [Needs to register fences again])
+ HMGUtils.scheduleJob(context, ReregisterGeofenceJobService::class.java,ReregisterGeofenceJobService.JobID, ReregisterGeofenceJobService.TriggerIntervalDuration)
}
- },null)
+
+ }, null)
+
}
- fun unRegisterAll(completion: (status: Boolean, exception:Exception?) -> Unit){
- getActiveGeofences({ success ->
- val mList = success.toMutableList()
- mList.add("12345")
- geofencingClient
- .removeGeofences(success)
- .addOnSuccessListener {
- completion(true, null)
- }
- .addOnFailureListener {
- completion(false, it)
- }
- removeActiveGeofences()
- }, { failed ->
- // Nothing to do with failed geofences.
- })
+ fun getGeoZonesFromPreference(context: Context):List{
+ val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
+ val json = pref.getString(PREF_KEY_HMG_ZONES, "[]")
+
+ val geoZones = GeoZoneModel().listFrom(json!!)
+ return geoZones
}
fun saveActiveGeofence(success: List, failed: List){
@@ -130,8 +170,8 @@ class HMG_Geofence {
}
fun removeActiveGeofences(){
- preferences.edit().putString(PREF_KEY_SUCCESS,"[]").apply()
- preferences.edit().putString(PREF_KEY_FAILED,"[]").apply()
+ preferences.edit().putString(PREF_KEY_SUCCESS, "[]").apply()
+ preferences.edit().putString(PREF_KEY_FAILED, "[]").apply()
}
fun getActiveGeofences(success: (success: List) -> Unit, failure: ((failed: List) -> Unit)?){
@@ -154,12 +194,48 @@ class HMG_Geofence {
}
fun getPatientID():Int?{
- val profileJson = preferences.getString("flutter.imei-user-data", "{}")
+ var profileJson = preferences.getString("flutter.imei-user-data", null)
+ if (profileJson == null)
+ profileJson = preferences.getString("flutter.user-profile", null)
+
val type = object : TypeToken?>() {}.type
- return gson.fromJson?>(profileJson,type)
+ return gson.fromJson?>(profileJson, type)
?.get("PatientID")
.toString()
.toDoubleOrNull()
?.toInt()
}
+
+
+ fun handleEvent(triggerGeofences: List, location: Location, transition: GeofenceTransition) {
+ getPatientID()?.let { patientId ->
+ getActiveGeofences({ activeGeofences ->
+
+ triggerGeofences.forEach { geofence ->
+ // Extract PointID from 'geofence.requestId' and find from active geofences
+ val pointID = activeGeofences.firstOrNull { it == geofence.requestId }?.split('_')?.first()
+ if (!pointID.isNullOrEmpty() && pointID.toIntOrNull() != null) {
+
+ val body = mutableMapOf(
+ "PointsID" to pointID.toIntOrNull(),
+ "GeoType" to transition.value,
+ "PatientID" to patientId
+ )
+ body.putAll(HMGUtils.defaultHTTPParams(context))
+
+ httpPost>(API.LOG_GEOFENCE, body, { response ->
+ saveLog(context, "HMG_GEOFENCE_NOTIFY", "Success: Notified to server\uD83D\uDE0E.")
+ sendNotification(context, transition.named(), geofence.requestId, "Notified to server.😎")
+ }, { exception ->
+ val errorMessage = "${transition.named()}, ${geofence.requestId}"
+ saveLog(context, "HMG_GEOFENCE_NOTIFY", "failed: $errorMessage | error: ${exception.localizedMessage}")
+ sendNotification(context, transition.named(), geofence.requestId, "Failed to notify server😔 -> ${exception.localizedMessage}")
+ })
+
+ }
+ }
+
+ }, null)
+ }
+ }
}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceBroadcastReceiver.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceBroadcastReceiver.kt
new file mode 100644
index 00000000..77df1572
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceBroadcastReceiver.kt
@@ -0,0 +1,49 @@
+
+
+package com.cloud.diplomaticquarterapp.geofence.intent_receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.cloud.diplomaticquarterapp.geofence.GeofenceTransition
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
+import com.cloud.diplomaticquarterapp.utils.Logs
+import com.google.android.gms.location.GeofenceStatusCodes
+import com.google.android.gms.location.GeofencingEvent
+
+class GeofenceBroadcastReceiver : BroadcastReceiver() {
+ private val LOG_TAG = "GeofenceBroadcastReceiver"
+ override fun onReceive(context: Context, intent: Intent) {
+
+ val geofencingEvent = GeofencingEvent.fromIntent(intent)
+ if (geofencingEvent.hasError()) {
+ val errorMessage = GeofenceErrorMessages.getErrorString(context, geofencingEvent.errorCode)
+ Log.e(LOG_TAG, errorMessage)
+
+ Logs.GeofenceEvent.save(context,LOG_TAG,"Error while triggering geofence event",Logs.STATUS.ERROR)
+ doReRegisterIfRequired(context,geofencingEvent.errorCode)
+
+ return
+ }
+
+ Logs.GeofenceEvent.save(context,LOG_TAG,"Geofence event triggered: ${GeofenceTransition.fromInt(geofencingEvent.geofenceTransition).value} for ${geofencingEvent.triggeringGeofences.map {it.requestId}}",Logs.STATUS.SUCCESS)
+ HMG_Geofence.shared(context).handleEvent(geofencingEvent.triggeringGeofences,geofencingEvent.triggeringLocation, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition));
+
+ }
+
+ fun doReRegisterIfRequired(context: Context, errorCode: Int){
+ val errorRequiredReregister = listOf(
+ GeofenceStatusCodes.GEOFENCE_NOT_AVAILABLE,
+ GeofenceStatusCodes.GEOFENCE_TOO_MANY_GEOFENCES,
+ GeofenceStatusCodes.GEOFENCE_TOO_MANY_PENDING_INTENTS,
+ GeofenceStatusCodes.GEOFENCE_REQUEST_TOO_FREQUENT
+ )
+
+ if(errorRequiredReregister.contains(errorCode))
+ HMG_Geofence.shared(context).register(){ status, error ->
+
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceBroadcastReceiverWithJobService.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceBroadcastReceiverWithJobService.kt
new file mode 100644
index 00000000..a9924ca1
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceBroadcastReceiverWithJobService.kt
@@ -0,0 +1,16 @@
+
+
+package com.cloud.diplomaticquarterapp.geofence.intent_receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
+import com.google.android.gms.location.GeofenceStatusCodes
+
+class GeofenceBroadcastReceiverWithJobService : BroadcastReceiver() {
+ override fun onReceive(context: Context, intent: Intent) {
+ GeofenceTransitionsJobIntentService.enqueueWork(context, intent)
+ }
+
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceErrorMessages.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceErrorMessages.kt
similarity index 67%
rename from android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceErrorMessages.kt
rename to android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceErrorMessages.kt
index 4890f7cb..01377d49 100755
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceErrorMessages.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceErrorMessages.kt
@@ -1,9 +1,10 @@
-package com.cloud.diplomaticquarterapp.geofence
+package com.cloud.diplomaticquarterapp.geofence.intent_receivers
import android.content.Context
import com.cloud.diplomaticquarterapp.R
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
import com.google.android.gms.common.api.ApiException
import com.google.android.gms.location.GeofenceStatusCodes
@@ -18,7 +19,7 @@ object GeofenceErrorMessages {
fun getErrorString(context: Context, errorCode: Int): String {
val resources = context.resources
- return when (errorCode) {
+ val errorMessage = when (errorCode) {
GeofenceStatusCodes.GEOFENCE_NOT_AVAILABLE ->
resources.getString(R.string.geofence_not_available)
@@ -28,7 +29,15 @@ object GeofenceErrorMessages {
GeofenceStatusCodes.GEOFENCE_TOO_MANY_PENDING_INTENTS ->
resources.getString(R.string.geofence_too_many_pending_intents)
+ GeofenceStatusCodes.GEOFENCE_INSUFFICIENT_LOCATION_PERMISSION ->
+ resources.getString(R.string.GEOFENCE_INSUFFICIENT_LOCATION_PERMISSION)
+
+ GeofenceStatusCodes.GEOFENCE_REQUEST_TOO_FREQUENT ->
+ resources.getString(R.string.GEOFENCE_REQUEST_TOO_FREQUENT)
+
else -> resources.getString(R.string.geofence_unknown_error)
}
+
+ return errorMessage
}
}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceTransitionsJobIntentService.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceTransitionsJobIntentService.kt
similarity index 53%
rename from android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceTransitionsJobIntentService.kt
rename to android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceTransitionsJobIntentService.kt
index f28e1720..214957cf 100755
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofenceTransitionsJobIntentService.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofenceTransitionsJobIntentService.kt
@@ -29,31 +29,27 @@
*/
-package com.cloud.diplomaticquarterapp.geofence
+package com.cloud.diplomaticquarterapp.geofence.intent_receivers
import android.content.Context
import android.content.Intent
-import android.location.Location
import android.util.Log
import androidx.core.app.JobIntentService
-import com.cloud.diplomaticquarterapp.utils.API
-import com.cloud.diplomaticquarterapp.utils.httpPost
-import com.cloud.diplomaticquarterapp.utils.sendNotification
-import com.github.kittinunf.fuel.core.extensions.jsonBody
-import com.github.kittinunf.fuel.core.isSuccessful
-import com.github.kittinunf.fuel.httpPost
-import com.google.android.gms.location.Geofence
+import com.cloud.diplomaticquarterapp.geofence.GeofenceTransition
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
+import com.cloud.diplomaticquarterapp.utils.saveLog
+import com.google.android.gms.location.GeofenceStatusCodes
import com.google.android.gms.location.GeofencingEvent
-import com.google.gson.Gson
class GeofenceTransitionsJobIntentService : JobIntentService() {
companion object {
private const val LOG_TAG = "GeoTrIntentService"
- private const val JOB_ID = 573
-
+ private const val JOB_ID = 95902
+ var context_: Context? = null
fun enqueueWork(context: Context, intent: Intent) {
+ context_ = context
enqueueWork(
context,
GeofenceTransitionsJobIntentService::class.java, JOB_ID,
@@ -64,43 +60,31 @@ class GeofenceTransitionsJobIntentService : JobIntentService() {
override fun onHandleWork(intent: Intent) {
val geofencingEvent = GeofencingEvent.fromIntent(intent)
if (geofencingEvent.hasError()) {
- val errorMessage = GeofenceErrorMessages.getErrorString(this, geofencingEvent.errorCode)
+ val errorMessage = GeofenceErrorMessages.getErrorString(context_!!, geofencingEvent.errorCode)
Log.e(LOG_TAG, errorMessage)
- return
- }
- if (geofencingEvent.geofenceTransition == Geofence.GEOFENCE_TRANSITION_ENTER || geofencingEvent.geofenceTransition == Geofence.GEOFENCE_TRANSITION_EXIT) {
- handleEvent(geofencingEvent.triggeringGeofences,geofencingEvent.triggeringLocation, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition));
- }
- }
- private fun handleEvent(triggerGeofences: List, location:Location, transition:GeofenceTransition) {
- val hmg = HMG_Geofence.shared(this)
- hmg.getPatientID()?.let { patientId ->
+ saveLog(context_!!,LOG_TAG,errorMessage)
+ doReRegisterIfRequired(context_!!, geofencingEvent.errorCode)
- hmg.getActiveGeofences({ activeGeofences ->
+ return
+ }
- triggerGeofences.forEach { geofence ->
- // Extract PointID from 'geofence.requestId' and find from active geofences
- val pointID = activeGeofences.firstOrNull {it == geofence.requestId}?.split('_')?.first()
- if(!pointID.isNullOrEmpty() && pointID.toIntOrNull() != null){
+ HMG_Geofence.shared(context_!!).handleEvent(geofencingEvent.triggeringGeofences,geofencingEvent.triggeringLocation, GeofenceTransition.fromInt(geofencingEvent.geofenceTransition));
- val body = mapOf(
- "PointsID" to pointID.toIntOrNull(),
- "GeoType" to transition.value,
- "PatientID" to patientId
- )
+ }
- httpPost>(API.LOG_GEOFENCE, body, { response ->
- sendNotification(this, transition.named(), geofence.requestId, "Notified to server.😎")
- },{ exception ->
- sendNotification(this, transition.named(), geofence.requestId, "Failed to notify server.😔")
- })
- }
- }
+ fun doReRegisterIfRequired(context: Context, errorCode: Int){
+ val errorRequiredReregister = listOf(
+ GeofenceStatusCodes.GEOFENCE_NOT_AVAILABLE,
+ GeofenceStatusCodes.GEOFENCE_TOO_MANY_GEOFENCES,
+ GeofenceStatusCodes.GEOFENCE_TOO_MANY_PENDING_INTENTS,
+ GeofenceStatusCodes.GEOFENCE_REQUEST_TOO_FREQUENT
+ )
+
+ if(errorRequiredReregister.contains(errorCode))
+ HMG_Geofence.shared(context).register(){ status, exc -> }
- },null)
- }
}
}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofencingRebootBroadcastReceiver.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofencingRebootBroadcastReceiver.kt
similarity index 58%
rename from android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofencingRebootBroadcastReceiver.kt
rename to android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofencingRebootBroadcastReceiver.kt
index 08a0c93f..6421b327 100644
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/GeofencingRebootBroadcastReceiver.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/GeofencingRebootBroadcastReceiver.kt
@@ -1,26 +1,22 @@
-package com.cloud.diplomaticquarterapp.geofence
+package com.cloud.diplomaticquarterapp.geofence.intent_receivers
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import android.os.Handler
-import android.os.Message
import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
-import com.cloud.diplomaticquarterapp.utils.HMGUtils
+import com.cloud.diplomaticquarterapp.utils.PREFS_STORAGE
class GeofencingRebootBroadcastReceiver : BroadcastReceiver(){
override fun onReceive(context: Context, intent: Intent) {
if (Intent.ACTION_BOOT_COMPLETED.equals(intent.action)) {
+// if (intent.action.equals("android.intent.action.BOOT_COMPLETE")) {
val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
pref.edit().putString("REBOOT_DETECTED","YES").apply()
- HMG_Geofence.shared(context).unRegisterAll { status, exception ->
- val geoZones = HMGUtils.getGeoZonesFromPreference(context)
- HMG_Geofence.shared(context).register(geoZones)
- }
+ HMG_Geofence.shared(context).register(){ status, error -> }
}
}
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/LocationProviderChangeReceiver.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/LocationProviderChangeReceiver.kt
new file mode 100644
index 00000000..273ca8f5
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/LocationProviderChangeReceiver.kt
@@ -0,0 +1,25 @@
+
+
+package com.cloud.diplomaticquarterapp.geofence.intent_receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.location.LocationManager
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
+import com.cloud.diplomaticquarterapp.utils.HMGUtils
+import com.cloud.diplomaticquarterapp.utils.PREFS_STORAGE
+
+class LocationProviderChangeReceiver : BroadcastReceiver() {
+ private val LOG_TAG = "LocationProviderChangeReceiver"
+ override fun onReceive(context: Context, intent: Intent) {
+
+ if (LocationManager.PROVIDERS_CHANGED_ACTION.equals(intent.action)) {
+ val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
+ pref.edit().putString("LOCATION_PROVIDER_CHANGE","YES").apply()
+
+ HMG_Geofence.shared(context).register(){ s, e -> }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/ReregisterGeofenceJobService.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/ReregisterGeofenceJobService.kt
new file mode 100644
index 00000000..0bc496bc
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/geofence/intent_receivers/ReregisterGeofenceJobService.kt
@@ -0,0 +1,24 @@
+package com.cloud.diplomaticquarterapp.geofence.intent_receivers
+
+import android.app.job.JobParameters
+import android.app.job.JobService
+import com.cloud.diplomaticquarterapp.geofence.HMG_Geofence
+import com.cloud.diplomaticquarterapp.utils.Logs
+
+class ReregisterGeofenceJobService : JobService(){
+ companion object{
+ val TriggerIntervalDuration:String = "06:00:00"
+ val JobID = 918273
+ }
+ override fun onStartJob(params: JobParameters?): Boolean {
+ Logs.save(applicationContext,"ReregisterGeofenceJobService.onStartJob", "triggered to re-register the geofences after $TriggerIntervalDuration >> [HH:mm:ss]")
+ HMG_Geofence.shared(applicationContext).register(){ status, error ->
+ jobFinished(params, true)
+ }
+ return true
+ }
+
+ override fun onStopJob(params: JobParameters?): Boolean {
+ return true
+ }
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/API.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/API.kt
index 30f57dde..924bda91 100644
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/API.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/API.kt
@@ -2,7 +2,7 @@ package com.cloud.diplomaticquarterapp.utils
class API {
companion object{
- private val BASE = "https://uat.hmgwebservices.com"
+ private val BASE = "https://hmgwebservices.com"
private val SERVICE = "Services/Patients.svc/REST"
val WIFI_CREDENTIALS = "$BASE/$SERVICE/Hmg_SMS_Get_By_ProjectID_And_PatientID"
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/Constants.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/Constants.kt
new file mode 100644
index 00000000..aa0f8ec2
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/Constants.kt
@@ -0,0 +1,8 @@
+package com.cloud.diplomaticquarterapp.utils
+
+
+const val PREFS_STORAGE = "FlutterSharedPreferences"
+const val PREF_KEY_SUCCESS = "HMG_GEOFENCE_SUCCESS"
+const val PREF_KEY_FAILED = "HMG_GEOFENCE_FAILED"
+const val PREF_KEY_HMG_ZONES = "flutter.hmg-geo-fences"
+const val PREF_KEY_LANGUAGE = "flutter.language"
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
index ceecd65b..94bf54e6 100644
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
@@ -3,6 +3,9 @@ package com.cloud.diplomaticquarterapp.utils
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
+import android.app.job.JobInfo
+import android.app.job.JobScheduler
+import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.os.Build
@@ -14,17 +17,16 @@ import com.cloud.diplomaticquarterapp.BuildConfig
import com.cloud.diplomaticquarterapp.MainActivity
import com.cloud.diplomaticquarterapp.R
import com.cloud.diplomaticquarterapp.geofence.GeoZoneModel
-import com.cloud.diplomaticquarterapp.geofence.PREFS_STORAGE
-import com.cloud.diplomaticquarterapp.geofence.PREF_KEY_HMG_ZONES
import com.github.kittinunf.fuel.core.extensions.jsonBody
import com.github.kittinunf.fuel.httpPost
-import com.google.android.gms.location.Geofence
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import io.flutter.plugin.common.MethodChannel
+import org.jetbrains.anko.doAsyncResult
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
+import java.text.SimpleDateFormat
import java.util.*
import kotlin.concurrent.timerTask
@@ -68,24 +70,65 @@ class HMGUtils {
}
}
- fun getGeoZonesFromPreference(context: Context): List {
+ fun getLanguageCode(context: Context) : Int {
val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
- val json = pref.getString(PREF_KEY_HMG_ZONES,"[]")
+ val lang = pref.getString(PREF_KEY_LANGUAGE, "ar")
+ return if (lang == "ar") 2 else 1
+ }
- val geoZones = json?.let { GeoZoneModel().listFrom(it) }
- return geoZones!!
+ fun defaultHTTPParams(context: Context) : Map{
+ return mapOf(
+ "ZipCode" to "966",
+ "VersionID" to 5.8,
+ "Channel" to 3,
+ "LanguageID" to getLanguageCode(context),
+ "IPAdress" to "10.20.10.20",
+ "generalid" to "Cs2020@2016$2958",
+ "PatientOutSA" to 0,
+ "SessionID" to null,
+ "isDentalAllowedBackend" to false,
+ "DeviceTypeID" to 2)
+ }
+
+
+ fun scheduleJob(context: Context, pendingIntentClassType:Class, jobId:Int, intervalDuration:String, deadlineMillis:Long = (30 * 1000)) { // default deadline: 30 Seconds
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+ val jobScheduler: JobScheduler = context.getSystemService(JobScheduler::class.java)
+
+ val serviceComponent = ComponentName(context, pendingIntentClassType)
+ val builder = JobInfo.Builder(jobId, serviceComponent)
+ builder.setPersisted(true)
+ builder.setBackoffCriteria(30000, JobInfo.BACKOFF_POLICY_LINEAR)
+
+ val intervalMillis = timeToMillis(intervalDuration,"HH:mm:ss")
+ builder.setMinimumLatency(intervalMillis) // wait at least
+ builder.setOverrideDeadline((intervalMillis + deadlineMillis)) // maximum delay
+ if (jobScheduler.schedule(builder.build()) == JobScheduler.RESULT_SUCCESS){
+ Logs.save(context,"ScheduleJob", "${pendingIntentClassType.simpleName}: Job scheduled to trigger after duration $intervalDuration >> HH:mm:ss --('MinimumLatency:$intervalMillis Deadline:${(intervalMillis + deadlineMillis)}')--",Logs.STATUS.SUCCESS)
+ }else{
+ Logs.save(context,"ScheduleJob", "${pendingIntentClassType.simpleName}: Failed to scheduled Job",Logs.STATUS.ERROR)
+ }
+
+ } else {
+ Logs.save(context,"ScheduleJob", "${pendingIntentClassType.simpleName}: Failed to scheduled Job on VERSION.SDK_INT < ${android.os.Build.VERSION_CODES.M}",Logs.STATUS.ERROR)
+ }
}
}
}
-private fun Timer.schedule(timerTask: TimerTask) {
-}
private const val NOTIFICATION_CHANNEL_ID = BuildConfig.APPLICATION_ID + ".channel"
-fun sendNotification(context: Context, title:String, @Nullable subtitle:String?, message:String?) {
+
+fun timeToMillis(time:String, format:String):Long{
+ val sdf = SimpleDateFormat(format, Locale.US)
+ val millis = sdf.parse(time).time + TimeZone.getDefault().rawOffset
+ return millis
+}
+
+fun sendNotification(context: Context, title: String, @Nullable subtitle: String?, message: String?) {
val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
@@ -117,8 +160,18 @@ fun sendNotification(context: Context, title:String, @Nullable subtitle:String?,
notificationManager.notify(getUniqueId(), notification.build())
}
+//-------------------------
+// Open Helper Methods
+//-------------------------
+fun getUniqueId() = ((System.currentTimeMillis() % 10000).toInt())
-private fun getUniqueId() = ((System.currentTimeMillis() % 10000).toInt())
+object DateUtils {
+ @JvmStatic
+ fun dateTimeNow() : String {
+ val format = SimpleDateFormat("dd-MMM-yyy hh:mm:ss")
+ return format.format(Date())
+ }
+}
fun isJSONValid(jsonString: String?): Boolean {
try { JSONObject(jsonString) } catch (ex: JSONException) {
@@ -129,31 +182,43 @@ fun isJSONValid(jsonString: String?): Boolean {
return true
}
+fun saveLog(context: Context, tag: String, message: String){
+ val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
+ var logs = pref.getString("LOGS", "")
+ logs += "$tag -> $message \n"
+ pref.edit().putString("LOGS", logs).apply();
+}
+
+fun getLogs(context: Context) : String?{
+ val pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
+ return pref.getString("LOGS", "")
+}
+
class HTTPResponse(data: T){
final var data:T = data
}
-fun httpPost(url: String, body: Map, onSuccess: (response: HTTPResponse) -> Unit, onError: (error: Exception) -> Unit){
+fun httpPost(url: String, body: Map, onSuccess: (response: HTTPResponse) -> Unit, onError: (error: Exception) -> Unit){
val gson = Gson()
val type = object : TypeToken() {}.type
val jsonBody = gson.toJson(body)
url.httpPost()
.jsonBody(jsonBody, Charsets.UTF_8)
.timeout(10000)
- .header("Content-Type","application/json")
- .header("Allow","*/*")
+ .header("Content-Type", "application/json")
+ .header("Allow", "*/*")
.response { request, response, result ->
+ result.doAsyncResult { }
result.fold({ data ->
val dataString = String(data)
- if(isJSONValid(dataString)){
- val responseData = gson.fromJson(dataString,type)
+ if (isJSONValid(dataString)) {
+ val responseData = gson.fromJson(dataString, type)
onSuccess(HTTPResponse(responseData))
- }else{
+ } else {
onError(Exception("Invalid response from server (Not a valid JSON)"))
}
}, {
onError(it)
- it.localizedMessage
})
}
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/Logs.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/Logs.kt
new file mode 100644
index 00000000..e74f463e
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/Logs.kt
@@ -0,0 +1,145 @@
+package com.cloud.diplomaticquarterapp.utils
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Build
+import com.cloud.diplomaticquarterapp.BuildConfig
+import com.google.gson.Gson
+
+class Logs {
+
+ enum class STATUS{
+ SUCCESS,
+ ERROR;
+ }
+ class GeofenceEvent{
+ companion object{
+ fun save(context: Context, tag:String, message:String, status:Logs.STATUS = STATUS.SUCCESS){
+ Logs.Common.save(context,"GeofenceEvent", tag, message, status)
+ }
+
+ fun list(context: Context, tag:String? = null, status:Logs.STATUS? = null):List{
+ return Logs.Common.list(context,"GeofenceEvent", tag, status)
+ }
+
+ fun raw(context: Context):String{
+ return Logs.Common.raw(context,"GeofenceEvent")
+ }
+ }
+ }
+
+ class RegisterGeofence{
+ companion object{
+ fun save(context: Context, tag:String, message:String, status:Logs.STATUS = STATUS.SUCCESS){
+ Logs.Common.save(context,"RegisterGeofence", tag, message, status)
+ }
+
+ fun list(context: Context, tag:String? = null, status:Logs.STATUS? = null):List{
+ return Logs.Common.list(context,"RegisterGeofence", tag, status)
+ }
+
+ fun raw(context: Context):String{
+ return Logs.Common.raw(context,"RegisterGeofence");
+ }
+ }
+ }
+
+
+ companion object{
+ private var pref:SharedPreferences? = null
+ fun save(context: Context, tag:String, message:String, status:Logs.STATUS = STATUS.SUCCESS){
+ Logs.Common.save(context,"Logs", tag, message, status)
+ }
+
+ fun list(context: Context, tag:String? = null, status:Logs.STATUS? = null):List{
+ return Logs.Common.list(context,"Logs", tag, status)
+ }
+
+ fun raw(context: Context):String{
+ return Logs.Common.raw(context,"Logs");
+ }
+
+ private fun storage(context: Context):SharedPreferences{
+ if(pref == null) {
+ pref = context.getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE)
+ }
+ return pref!!
+ }
+ }
+
+ private class Common{
+ companion object{
+ private val gson = Gson()
+
+ fun save(context: Context, key:String, tag:String, message:String, status:Logs.STATUS = STATUS.SUCCESS){
+ if(!BuildConfig.DEBUG)
+ return
+
+ val pref = Logs.storage(context)
+
+ val string = pref.getString(key,"{}")
+ val json = gson.fromJson(string,LogsContainerModel::class.java)
+ json.add(
+ LogModel().apply {
+ this.TAG = tag
+ this.MESSAGE = message
+ this.STATUS = status.name
+ this.DATE = DateUtils.dateTimeNow()
+ }
+ )
+
+ pref.edit().putString(key,gson.toJson(json)).apply()
+ }
+
+ fun list(context: Context, key:String, tag:String? = null, status:Logs.STATUS? = null):List{
+ val pref = Logs.storage(context)
+ val string = pref.getString(key,"{}")
+ val json = gson.fromJson(string,LogsContainerModel::class.java)
+ if(tag == null && status == null) {
+ return json.LOGS
+ }else if(tag != null && status != null){
+ return json.LOGS.filter { (it.TAG == tag && it.STATUS == status.name) }
+ }else if(tag != null){
+ return json.LOGS.filter { (it.TAG == tag) }
+ }else if(status != null){
+ return json.LOGS.filter { (it.STATUS == status.name) }
+ }
+ return listOf()
+ }
+
+ fun raw(context: Context, key:String):String{
+ val pref = Logs.storage(context)
+ val string = pref.getString(key,"{}")
+ return string!!
+ }
+
+ }
+ }
+
+ class LogModel{
+ lateinit var TAG:String
+ lateinit var MESSAGE:String
+ lateinit var STATUS:String
+ lateinit var DATE:String
+
+ companion object{
+ fun with(tag:String, message:String, status:String):LogModel{
+ return LogModel().apply {
+ this.TAG = tag
+ this.MESSAGE = message
+ this.STATUS = status
+ this.DATE = DateUtils.dateTimeNow()
+ }
+ }
+ }
+ }
+
+ class LogsContainerModel{
+ var LOGS = mutableListOf()
+ fun add(log:LogModel){
+ LOGS.add(log)
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt
index ed1a62c8..eb2fff08 100644
--- a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/PlatformBridge.kt
@@ -105,7 +105,7 @@ class PlatformBridge(binaryMessenger: BinaryMessenger, flutterMainActivity: Main
override fun success(result: Any?) {
if(result is String) {
val geoZones = GeoZoneModel().listFrom(result)
- HMG_Geofence.shared(mainActivity).register(geoZones)
+ HMG_Geofence.shared(mainActivity).register(){ s, e -> }
}
}
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 8acc0c12..4e107030 100755
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -13,4 +13,10 @@
You have provided too many PendingIntents to the addGeofences() call.
+
+ App do not have permission to access location service.
+
+
+ Geofence requests happened too frequently.
+
diff --git a/assets/images/map_markers/destination_map_marker.png b/assets/images/map_markers/destination_map_marker.png
new file mode 100644
index 00000000..4f4eca35
Binary files /dev/null and b/assets/images/map_markers/destination_map_marker.png differ
diff --git a/assets/images/map_markers/driver-pin.png b/assets/images/map_markers/driver-pin.png
new file mode 100644
index 00000000..9d16ceca
Binary files /dev/null and b/assets/images/map_markers/driver-pin.png differ
diff --git a/assets/images/map_markers/source_map_marker.png b/assets/images/map_markers/source_map_marker.png
new file mode 100644
index 00000000..4b493b09
Binary files /dev/null and b/assets/images/map_markers/source_map_marker.png differ
diff --git a/ios/GoogleService-Info.plist b/ios/GoogleService-Info.plist
index 0c093a2a..633037cb 100644
--- a/ios/GoogleService-Info.plist
+++ b/ios/GoogleService-Info.plist
@@ -3,21 +3,23 @@
CLIENT_ID
- 864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com
+ 815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com
REVERSED_CLIENT_ID
- com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r
+ com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt
+ ANDROID_CLIENT_ID
+ 815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com
API_KEY
- AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs
+ AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA
GCM_SENDER_ID
- 864393916058
+ 815750722565
PLIST_VERSION
1
BUNDLE_ID
- com.cloud.diplomaticquarterapp
+ com.HMG.HMG-Smartphone
PROJECT_ID
- diplomaticquarter-d2385
+ api-project-815750722565
STORAGE_BUCKET
- diplomaticquarter-d2385.appspot.com
+ api-project-815750722565.appspot.com
IS_ADS_ENABLED
IS_ANALYTICS_ENABLED
@@ -29,8 +31,8 @@
IS_SIGNIN_ENABLED
GOOGLE_APP_ID
- 1:864393916058:ios:13f787bbfe6051f8b97923
+ 1:815750722565:ios:328ec247a81a2ca23c186c
DATABASE_URL
- https://diplomaticquarter-d2385.firebaseio.com
+ https://api-project-815750722565.firebaseio.com
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 77dfa5e1..e16b62e0 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -20,7 +20,7 @@ PODS:
- Firebase/Messaging (6.33.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 4.7.0)
- - firebase_core (0.5.3):
+ - firebase_core (0.5.2):
- Firebase/CoreOnly (~> 6.33.0)
- Flutter
- firebase_core_web (0.1.0):
@@ -70,7 +70,7 @@ PODS:
- Flutter
- flutter_tts (0.0.1):
- Flutter
- - geolocator (6.1.9):
+ - "geolocator (6.0.0+4)":
- Flutter
- google_maps_flutter (0.0.1):
- Flutter
@@ -385,7 +385,7 @@ SPEC CHECKSUMS:
device_calendar: 23b28a5f1ab3bf77e34542fb1167e1b8b29a98f5
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
- firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
+ firebase_core: 350ba329d1641211bc6183a3236893cafdacfea7
firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
@@ -400,7 +400,7 @@ SPEC CHECKSUMS:
flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
- geolocator: 057a0c63a43e9c5296d8ad845a3ac8e6df23d899
+ geolocator: 1ae40084cc6c1586ce5ad12cfc3fd38c64d05f2f
google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 0f0f942c..ade2e0aa 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -28,8 +28,10 @@
E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */; };
E923EFD82588D17700E3E751 /* gpx.gpx in Resources */ = {isa = PBXBuildFile; fileRef = E923EFD72588D17700E3E751 /* gpx.gpx */; };
E9620805255C2ED100D3A35D /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9620804255C2ED100D3A35D /* NetworkExtension.framework */; };
+ E9A35329258B8E8F00CBA688 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9A35328258B8E8F00CBA688 /* GoogleService-Info.plist */; };
E9C8C136256BACDA00EFFB62 /* HMG_Guest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */; };
E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */; };
+ E9F7623B25922BCE00FB5CCF /* FlutterConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -78,8 +80,10 @@
E923EFD72588D17700E3E751 /* gpx.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = gpx.gpx; sourceTree = ""; };
E9620803255C2ED100D3A35D /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; };
E9620804255C2ED100D3A35D /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
+ E9A35328258B8E8F00CBA688 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; };
E9C8C135256BACDA00EFFB62 /* HMG_Guest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMG_Guest.swift; sourceTree = ""; };
E9E27167256E3A4000F49B69 /* LocalizedFromFlutter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedFromFlutter.swift; sourceTree = ""; };
+ E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlutterConstants.swift; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -128,6 +132,7 @@
97C146E51CF9000F007C117D = {
isa = PBXGroup;
children = (
+ E9A35328258B8E8F00CBA688 /* GoogleService-Info.plist */,
E923EFD72588D17700E3E751 /* gpx.gpx */,
9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* Runner */,
@@ -177,6 +182,7 @@
E923EFD125863FDF00E3E751 /* GeoZoneModel.swift */,
E923EFD3258645C100E3E751 /* HMG_Geofence.swift */,
E923EFD52587443800E3E751 /* HMGPlatformBridge.swift */,
+ E9F7623A25922BCE00FB5CCF /* FlutterConstants.swift */,
);
path = Helper;
sourceTree = "";
@@ -265,6 +271,7 @@
files = (
E91B53A0256AAC1400E96549 /* GuestPOC_Certificate.cer in Resources */,
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
+ E9A35329258B8E8F00CBA688 /* GoogleService-Info.plist in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
E923EFD82588D17700E3E751 /* gpx.gpx in Resources */,
E91B539F256AAC1400E96549 /* GuestPOC_Certificate.p12 in Resources */,
@@ -374,6 +381,7 @@
E91B5396256AAA6500E96549 /* GlobalHelper.swift in Sources */,
E923EFD4258645C100E3E751 /* HMG_Geofence.swift in Sources */,
E923EFD62587443800E3E751 /* HMGPlatformBridge.swift in Sources */,
+ E9F7623B25922BCE00FB5CCF /* FlutterConstants.swift in Sources */,
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
E9E27168256E3A4000F49B69 /* LocalizedFromFlutter.swift in Sources */,
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
@@ -472,7 +480,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = "";
+ DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -611,7 +619,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = "";
+ DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -644,7 +652,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = "";
+ DEVELOPMENT_TEAM = 3A359E86ZF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index e686619c..2dc828d1 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -2,46 +2,67 @@ import UIKit
import Flutter
import GoogleMaps
+var userNotificationCenterDelegate:UNUserNotificationCenterDelegate? = nil
@UIApplicationMain
@objc class AppDelegate: FlutterAppDelegate {
let locationManager = CLLocationManager()
+ var flutterViewController:MainFlutterVC!
override func application( _ application: UIApplication,didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-// initLocationManager()
GMSServices.provideAPIKey("AIzaSyCiiJiHkocPbcziHt9O8rGWavDrxHRQys8")
GeneratedPluginRegistrant.register(with: self)
- if let mainViewController = window.rootViewController as? MainFlutterVC{
- HMGPlatformBridge.initialize(flutterViewController: mainViewController)
- }
+ initializePlatformChannel()
if let _ = launchOptions?[.location] {
HMG_Geofence.initGeofencing()
}
+ UNUserNotificationCenter.current().delegate = self
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
-}
-
-extension AppDelegate: CLLocationManagerDelegate {
- func initLocationManager(){
- locationManager.allowsBackgroundLocationUpdates = true
- locationManager.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
- locationManager.activityType = .other
- locationManager.delegate = self
- locationManager.requestAlwaysAuthorization()
+
+ func initializePlatformChannel(){
+ if let mainViewController = window.rootViewController as? MainFlutterVC{ // platform initialization suppose to be in foreground
+ flutterViewController = mainViewController
+ HMGPlatformBridge.initialize(flutterViewController: flutterViewController)
+
+ }else if let mainViewController = initialViewController(){ // platform initialization suppose to be in background
+ flutterViewController = mainViewController
+ HMGPlatformBridge.initialize(flutterViewController: flutterViewController)
+ }
}
-
- func locationManager(_ manager: CLLocationManager, didEnterRegion region: CLRegion) {
- if region is CLCircularRegion {
+
+
+ func initialViewController() -> MainFlutterVC?{
+ return nil //UIStoryboard(name: "Main", bundle: .main).instantiateInitialViewController() as? MainFlutterVC
}
- }
-
- func locationManager(_ manager: CLLocationManager, didExitRegion region: CLRegion) {
- if region is CLCircularRegion {
+}
+
+extension AppDelegate{
+ override func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+ if (notification.request.content.categoryIdentifier == HmgLocalNotificationCategoryIdentifier){
+ completionHandler([.alert,.sound])
+ }else{
+ super.userNotificationCenter(center, willPresent: notification, withCompletionHandler: completionHandler)
+ }
}
- }
}
+
+
+/*
+ let dart = FlutterDartProject(precompiledDartBundle: .main)
+ let engine = FlutterEngine(name: "com.hmg.cs", project: dart, allowHeadlessExecution: true)
+ if engine.run(){
+ flutterMethodChannel = FlutterMethodChannel(name: "HMG-Platform-Bridge", binaryMessenger: engine.binaryMessenger)
+
+ Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { (timer) in
+ FlutterText.with(key: "alreadyConnectedHmgNetwork"){ localized in
+ print(localized)
+ }
+ }
+ }
+ */
diff --git a/ios/Runner/Helper/API.swift b/ios/Runner/Helper/API.swift
index 763147c8..b487f033 100644
--- a/ios/Runner/Helper/API.swift
+++ b/ios/Runner/Helper/API.swift
@@ -13,5 +13,10 @@ fileprivate let BASE_URL = "\(DOMAIN)/\(SERVICE)"
struct API {
static let WIFI_CREDENTIALS = "\(BASE_URL)/Hmg_SMS_Get_By_ProjectID_And_PatientID"
-
}
+
+
+//struct API {
+// static let WIFI_CREDENTIALS = FlutterConstants.WIFI_CREDENTIALS_URL
+// static let LOG_GEOFENCE = FlutterConstants.LOG_GEOFENCE_URL
+//}
diff --git a/ios/Runner/Helper/Extensions.swift b/ios/Runner/Helper/Extensions.swift
index a8793617..de67f9b9 100644
--- a/ios/Runner/Helper/Extensions.swift
+++ b/ios/Runner/Helper/Extensions.swift
@@ -18,6 +18,24 @@ extension String{
}
}
+extension Date{
+ func toString(format:String) -> String{
+ let df = DateFormatter()
+ df.dateFormat = format
+ return df.string(from: self)
+ }
+}
+
+extension Dictionary{
+ func merge(dict:[String:Any?]) -> [String:Any?]{
+ var self_ = self as! [String:Any?]
+ dict.forEach { (kv) in
+ self_.updateValue(kv.value, forKey: kv.key)
+ }
+ return self_
+ }
+}
+
extension Bundle {
func certificate(named name: String) -> SecCertificate {
diff --git a/ios/Runner/Helper/FlutterConstants.swift b/ios/Runner/Helper/FlutterConstants.swift
new file mode 100644
index 00000000..f1b3f098
--- /dev/null
+++ b/ios/Runner/Helper/FlutterConstants.swift
@@ -0,0 +1,36 @@
+//
+// FlutterConstants.swift
+// Runner
+//
+// Created by ZiKambrani on 22/12/2020.
+//
+
+import UIKit
+
+class FlutterConstants{
+ static var LOG_GEOFENCE_URL:String?
+ static var WIFI_CREDENTIALS_URL:String?
+ static var DEFAULT_HTTP_PARAMS:[String:Any?]?
+
+ class func set(){
+
+ // (FiX) Take a start with FlutterMethodChannel (kikstart)
+ /* First call to flutter method is not returning the correct value (Always returning 'NSObject') then after it wroking fine and returning correct value*/
+ FlutterText.with(key: "test") { (test) in
+
+ flutterMethodChannel?.invokeMethod("getDefaultHttpParameters", arguments: nil){ (response) in
+ if let defaultHTTPParams = response as? [String:Any?]{
+ DEFAULT_HTTP_PARAMS = defaultHTTPParams
+ }
+
+ }
+
+ flutterMethodChannel?.invokeMethod("getLogGeofenceFullUrl", arguments:nil){ (response) in
+ if let url = response as? String{
+ LOG_GEOFENCE_URL = url
+ }
+ }
+
+ }
+ }
+}
diff --git a/ios/Runner/Helper/GlobalHelper.swift b/ios/Runner/Helper/GlobalHelper.swift
index c5eb7295..37687806 100644
--- a/ios/Runner/Helper/GlobalHelper.swift
+++ b/ios/Runner/Helper/GlobalHelper.swift
@@ -31,27 +31,59 @@ func dictionary(from:String) -> [String:Any]?{
}
-func showNotification(identifier:String? = nil, title:String?, subtitle:String?, message:String?, sound:UNNotificationSound = UNNotificationSound.default){
- let notificationContent = UNMutableNotificationContent()
-
- if identifier != nil { notificationContent.categoryIdentifier = identifier! }
- if title != nil { notificationContent.title = title! }
- if subtitle != nil { notificationContent.body = message! }
- if message != nil { notificationContent.subtitle = subtitle! }
-
- notificationContent.sound = UNNotificationSound.default
- let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
- let request = UNNotificationRequest(identifier: "\(Date().timeIntervalSinceNow)", content: notificationContent, trigger: trigger)
- UNUserNotificationCenter.current().add(request) { error in
- if let error = error {
- print("Error: \(error)")
+let HmgLocalNotificationCategoryIdentifier = "hmg.local.notification"
+func showNotification(identifier:String? = nil, title:String?, subtitle:String?, message:String?, sound:UNNotificationSound = UNNotificationSound.default, categoryIdentifier:String = HmgLocalNotificationCategoryIdentifier){
+ DispatchQueue.main.async {
+ let notificationContent = UNMutableNotificationContent()
+ notificationContent.categoryIdentifier = categoryIdentifier
+
+ if identifier != nil { notificationContent.categoryIdentifier = identifier! }
+ if title != nil { notificationContent.title = title! }
+ if subtitle != nil { notificationContent.body = message! }
+ if message != nil { notificationContent.subtitle = subtitle! }
+
+ notificationContent.sound = UNNotificationSound.default
+ let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
+ let request = UNNotificationRequest(identifier: "\(Date().timeIntervalSinceNow)", content: notificationContent, trigger: trigger)
+
+
+ UNUserNotificationCenter.current().add(request) { error in
+ if let error = error {
+ print("Error: \(error)")
+ }
}
}
}
+func appLanguageCode() -> Int{
+ let lang = UserDefaults.standard.string(forKey: "language") ?? "ar"
+ return lang == "ar" ? 2 : 1
+}
+
+func userProfile() -> [String:Any?]?{
+ var userProf = UserDefaults.standard.string(forKey: "flutter.imei-user-data")
+ if(userProf == nil){
+ userProf = UserDefaults.standard.string(forKey: "flutter.user-profile")
+ }
+ return dictionary(from: userProf ?? "{}")
+}
+
+fileprivate let defaultHTTPParams:[String : Any?] = [
+ "ZipCode" : "966",
+ "VersionID" : 5.8,
+ "Channel" : 3,
+ "LanguageID" : appLanguageCode(),
+ "IPAdress" : "10.20.10.20",
+ "generalid" : "Cs2020@2016$2958",
+ "PatientOutSA" : 0,
+ "SessionID" : nil,
+ "isDentalAllowedBackend" : false,
+ "DeviceTypeID" : 2
+]
-func httpPostRequest(urlString:String, jsonBody:[String:Any], completion:((Bool,[String:Any]?)->Void)?){
- let json: [String: Any] = jsonBody
+func httpPostRequest(urlString:String, jsonBody:[String:Any?], completion:((Bool,[String:Any]?)->Void)?){
+ var json: [String: Any?] = jsonBody
+ json = json.merge(dict: defaultHTTPParams)
let jsonData = try? JSONSerialization.data(withJSONObject: json)
// create post request
@@ -77,6 +109,8 @@ func httpPostRequest(urlString:String, jsonBody:[String:Any], completion:((Bool,
completion?(false,responseJSON)
}
+ }else{
+ completion?(false,nil)
}
}
diff --git a/ios/Runner/Helper/HMGPlatformBridge.swift b/ios/Runner/Helper/HMGPlatformBridge.swift
index f897188c..f94f9b34 100644
--- a/ios/Runner/Helper/HMGPlatformBridge.swift
+++ b/ios/Runner/Helper/HMGPlatformBridge.swift
@@ -49,6 +49,9 @@ class HMGPlatformBridge{
print("")
}
+ Timer.scheduledTimer(withTimeInterval: 0.1, repeats: false) { (timer) in
+ FlutterConstants.set()
+ }
}
diff --git a/ios/Runner/Helper/HMG_Geofence.swift b/ios/Runner/Helper/HMG_Geofence.swift
index fb469165..47454d3e 100644
--- a/ios/Runner/Helper/HMG_Geofence.swift
+++ b/ios/Runner/Helper/HMG_Geofence.swift
@@ -129,8 +129,10 @@ extension HMG_Geofence : CLLocationManagerDelegate{
extension HMG_Geofence{
func handleEvent(for region: CLRegion!, transition:Transition, location:CLLocation?) {
- notifyUser(forRegion: region, transition: transition, location: locationManager.location)
- notifyServer(forRegion: region, transition: transition, location: locationManager.location)
+ if let userProfile = userProfile(){
+ notifyUser(forRegion: region, transition: transition, location: locationManager.location, userProfile: userProfile)
+ notifyServer(forRegion: region, transition: transition, location: locationManager.location, userProfile: userProfile)
+ }
}
func geoZone(by id: String) -> GeoZoneModel? {
@@ -144,20 +146,14 @@ extension HMG_Geofence{
}
- func notifyUser(forRegion:CLRegion, transition:Transition, location:CLLocation?){
- if let zone = geoZone(by: forRegion.identifier){
- if UIApplication.shared.applicationState == .active {
- mainViewController.showAlert(withTitle: transition.name(), message: zone.message())
- }else{
-
- }
+ func notifyUser(forRegion:CLRegion, transition:Transition, location:CLLocation?, userProfile:[String:Any?]){
+ if let patientId = userProfile["PatientID"] as? Int{
+
}
}
- func notifyServer(forRegion:CLRegion, transition:Transition, location:CLLocation?){
- df.dateFormat = "MMM/dd/yyyy hh:mm:ss"
- if let userProfileJson = UserDefaults.standard.string(forKey: "flutter.user-profile"),
- let userProfile = dictionary(from: userProfileJson), let patientId = userProfile["PatientID"] as? Int{
+ func notifyServer(forRegion:CLRegion, transition:Transition, location:CLLocation?, userProfile:[String:Any?]){
+ if let patientId = userProfile["PatientID"] as? Int{
if let idString = forRegion.identifier.split(separator: "_").first, let idInt = Int(idString){
let body:[String:Any] = [
@@ -165,22 +161,20 @@ extension HMG_Geofence{
"GeoType":transition.rawValue,
"PatientID":patientId
]
+
+ var logs = UserDefaults.init(suiteName: "GeoFenceLog")?.dictionary(forKey: "GEOFENCE_LOGS") ?? [:]
+ var geo = (logs[forRegion.identifier] as? [String]) ?? []
let url = "https://hmgwebservices.com/Services/Patients.svc/REST/GeoF_InsertPatientFileInfo"
httpPostRequest(urlString: url, jsonBody: body){ (status,json) in
- let status_ = status ? "Notified" : "Not notified"
+ let status_ = status ? "Notified successfully:" : "Failed to notify:"
showNotification(title: transition.name(), subtitle: forRegion.identifier, message: status_)
- var logs = UserDefaults.init(suiteName: "GeoFenceLog")?.dictionary(forKey: "LOGS") ?? [:]
- if var geo = logs[forRegion.identifier] as? [String]{
- geo.append("\(status_) at \(df.string(from: Date()))")
- }else{
- logs.updateValue(["\(status_) at \(df.string(from: Date()))"], forKey: forRegion.identifier)
- }
-
- UserDefaults.init(suiteName: "GeoFenceLog")?.set(logs, forKey: "LOGS")
+ geo.append("\(status_) \(transition.name()) at \(Date().toString(format: "dd/MMM/yyy hh:mm:ss"))")
+ logs.updateValue( geo, forKey: forRegion.identifier)
+ UserDefaults.init(suiteName: "GeoFenceLog")?.set(logs, forKey: "GEOFENCE_LOGS")
}
}
}
diff --git a/ios/gpx.gpx b/ios/gpx.gpx
index 9cc26956..ed8e9be6 100644
--- a/ios/gpx.gpx
+++ b/ios/gpx.gpx
@@ -1 +1 @@
-
Sverrir Sigmundarson
Office
Office
Mahmoud Home
Mahmoud Home
Panorama Mall
Panorama Mall
Saudi Architects Crossing
Saudi Architects Crossing
Office
Office
\ No newline at end of file
+
Sverrir Sigmundarson
608.26
620.97
617.77
643.86
\ No newline at end of file
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 5bfb8d49..1e1bae3b 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -32,6 +32,9 @@ const WEATHER_INDICATOR = 'Services/Weather.svc/REST/GetCityInfo';
const GET_PRIVILEGE = 'Services/Patients.svc/REST/Service_Privilege';
+// Wifi Credentials
+const WIFI_CREDENTIALS = "Services/Patients.svc/Hmg_SMS_Get_By_ProjectID_And_PatientID";
+
///Doctor
const GET_MY_DOCTOR =
'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult';
@@ -429,7 +432,6 @@ class AppGlobal {
Request getPublicRequest() {
Request request = new Request();
- request.VersionID = 5.6; //3.6;
request.Channel = 3;
request.IPAdress = "10.20.10.20";
request.generalid = 'Cs2020@2016\$2958';
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 970eb78d..221b481a 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -242,6 +242,10 @@ const Map localizedValues = {
"en": "Email Sent Successfully",
"ar": "تم إرسال البريد الإلكتروني بنجاح"
},
+ "EmailSentError": {
+ "en": "Error Sending Email",
+ "ar": "خطأ في إرسال البريد الإلكتروني"
+ },
"close": {"en": "Close", "ar": "مغلق"},
"booked": {"en": "Booked", "ar": "محجوز"},
"confirmed": {"en": "Confirmed", "ar": "مؤكد"},
@@ -1218,6 +1222,10 @@ const Map localizedValues = {
"en": "Send a copy of this report to the email",
"ar": "أرسل نسخة من هذا التقرير إلى البريد الإلكتروني"
},
+ "update-email-msg": {
+ "en": "Email updated",
+ "ar": "تم تحديث البريد الالكتروني"
+ },
"update-email": {"en": "Update Email", "ar": "تحديث البريد الالكتروني"},
"booked-success": {
"en": "The appointment has been successfully booked.",
@@ -1449,6 +1457,10 @@ const Map localizedValues = {
"en": "View List of Children",
"ar": "عرض قائمة الأطفال"
},
+ "trackDeliveryDriver": {
+ "en": "Track Delivery Driver",
+ "ar": "trackDeliveryDriver"
+ },
"covidTest": {
"en": "COVID-19 TEST",
"ar": "فحص كورونا"
@@ -1486,6 +1498,31 @@ const Map localizedValues = {
"ar": "سكر الدم"
},
+ "covid19_driveThrueTest": {
+ "en": "'Covid-19- Drive-Thru Test'",
+ "ar": "Covid-19- الفحص من خلال القيادة"
+ },
+ "E-Referral": {
+ "en": "'E-Referral'",
+ "ar": "الإحالة الإلكترونية"
+ },
+ "childName": {
+ "en": "'CHILD NAME'",
+ "ar": "إسم الطفل"
+ },
+ "recordDeleted": {
+ "en": "'Record Deleted'",
+ "ar": "تم حذف السجل"
+ },
+ "msg_email_address_up_to_date": {
+ "en": "Please ensure that the email address is up-to-date and process to view the schedule",
+ "ar": "يرجى التأكد من أن عنوان البريد الإلكتروني محدث وأن العملية لعرض الجدول الزمني"
+ },
+ "add-new-child": {"en" : "ADD NEW CHILD", "ar": "إضافة طفل جديد"},
+ "visit": {"en" : "Visit", "ar": "الزيارة"},
+ "send-child-email-msg": {"en" : "Send the child's schedule to the email", "ar": "أرسل جدول الطفل إلى البريد الإلكتروني"},
+ "vaccination-add-child-msg": {"en" : "Add the child's information below to receive the schedule of vaccinations.", "ar": "أضف معلومات الطفل أدناه للحصول على جدول التطعيمات."},
+ "child_added_successfully": {"en" : "Child added successfully", "ar": "تمت إضافة الطفل بنجاح"},
"my-tracker": {
"en": "My Tracker",
"ar": "قراءاتي"
diff --git a/lib/core/model/pharmacies/order_model.dart b/lib/core/model/pharmacies/order_model.dart
index 027d1f81..c0a12caa 100644
--- a/lib/core/model/pharmacies/order_model.dart
+++ b/lib/core/model/pharmacies/order_model.dart
@@ -2,6 +2,7 @@
import 'dart:convert';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyImageObject.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
List orderModelFromJson(String str) => List.from(json.decode(str).map((x) => OrderModel.fromJson(x)));
@@ -306,7 +307,22 @@ class IngAddress {
String customerAttributes;
DateTime createdOnUtc;
dynamic province;
- LatLong latLong;
+ String latLong;
+
+ LatLng getLocation(){
+ if(latLong.contains(',')){
+ var parts = latLong.trim().split(',');
+ if(parts.length == 2){
+ var lat = double.tryParse(parts.first);
+ var lng = double.tryParse(parts.last);
+ if(lat != null || lng != null) {
+ var location = LatLng(lat, lng);
+ return location;
+ }
+ }
+ }
+ return null;
+ }
factory IngAddress.fromJson(Map json) => IngAddress(
id: json["id"],
@@ -326,7 +342,7 @@ class IngAddress {
customerAttributes: json["customer_attributes"],
createdOnUtc: DateTime.parse(json["created_on_utc"]),
province: json["province"],
- latLong: latLongValues.map[json["lat_long"]],
+ latLong: json["lat_long"],
);
Map toJson() => {
@@ -347,7 +363,7 @@ class IngAddress {
"customer_attributes": customerAttributes,
"created_on_utc": createdOnUtc.toIso8601String(),
"province": province,
- "lat_long": latLongValues.reverse[latLong],
+ "lat_long": latLong,
};
}
@@ -491,9 +507,9 @@ class OrderModelCustomer {
isSystemAccount: json["is_system_account"],
systemName: json["system_name"],
lastIpAddress: lastIpAddressValues.map[json["last_ip_address"]],
- createdOnUtc: DateTime.parse(json["created_on_utc"]),
- lastLoginDateUtc: DateTime.parse(json["last_login_date_utc"]),
- lastActivityDateUtc: DateTime.parse(json["last_activity_date_utc"]),
+ createdOnUtc: (json["created_on_utc"] != null) ? DateTime.parse(json["created_on_utc"]) : null,
+ lastLoginDateUtc: (json["created_on_utc"] != null) ? DateTime.parse(json["last_login_date_utc"]) : null,
+ lastActivityDateUtc: (json["created_on_utc"] != null) ? DateTime.parse(json["last_activity_date_utc"]) : null,
registeredInStoreId: json["registered_in_store_id"],
roleIds: List.from(json["role_ids"].map((x) => x)),
);
diff --git a/lib/core/service/childvaccines/vaccination_table_service.dart b/lib/core/service/childvaccines/vaccination_table_service.dart
index 7f987b76..fc2b40e9 100644
--- a/lib/core/service/childvaccines/vaccination_table_service.dart
+++ b/lib/core/service/childvaccines/vaccination_table_service.dart
@@ -1,7 +1,9 @@
import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/create_vaccination_table.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import '../base_service.dart';
class VaccinationTableService extends BaseService {
@@ -10,19 +12,18 @@ class VaccinationTableService extends BaseService {
- Future getCreateVaccinationTableOrders() async {
+ Future getCreateVaccinationTableOrders(List_BabyInformationModel babyInfo, bool sendEmail) async {
+ String babyBDFormatted = "${DateUtil.convertDateToString(babyInfo.dOB)}/";
+
hasError = false;
await getUser();
- body['BabyName']="fffffffffff eeeeeeeeeeeeee";
- body['DOB'] = "/Date(1585774800000+0300)/";
+ body['BabyName']= babyInfo.babyName;
+ body['DOB'] = babyBDFormatted;
body['EmailAddress'] = user.emailAddress;
body['isDentalAllowedBackend'] = false;
- body['SendEmail'] = false;
+ body['SendEmail'] = sendEmail;
body['IsLogin'] =true;
-
-
-
await baseAppClient.post(GET_TABLE_REQUEST,
onSuccess: (dynamic response, int statusCode) {
createVaccinationTableModelList.clear();
diff --git a/lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart b/lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart
index 3b72dd50..d0ccb8a1 100644
--- a/lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart
+++ b/lib/core/viewModels/child_vaccines/vaccination_table_view_model.dart
@@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
+import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/create_vaccination_table.dart';
import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart';
@@ -11,14 +12,12 @@ import '../base_view_model.dart';
class VaccinationTableViewModel extends BaseViewModel{
VaccinationTableService _creteVaccinationTableService = locator();
+ List get creteVaccinationTableModelList=> _creteVaccinationTableService.createVaccinationTableModelList;
- // String get creteVaccinationTableContent => _creteVaccinationTableService.userAgreementContent;
- //String get userAgreementContent => _creteNewBabyService.v//_reportsService.userAgreementContent;
- List get creteVaccinationTableModelList=> _creteVaccinationTableService.createVaccinationTableModelList;//.createNewBabyModelList;
- getCreateVaccinationTable() async {
+ getCreateVaccinationTable(List_BabyInformationModel babyInfo, bool sendEmail) async {
setState(ViewState.Busy);
- await _creteVaccinationTableService.getCreateVaccinationTableOrders();//getCreateNewBabyOrders();
+ await _creteVaccinationTableService.getCreateVaccinationTableOrders(babyInfo, sendEmail);//getCreateNewBabyOrders();
if ( _creteVaccinationTableService.hasError) {
error = _creteVaccinationTableService.error;
diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
index 1359ab8d..3c3c18c1 100644
--- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
@@ -203,7 +203,7 @@ class _AllHabibMedicalServiceState extends State {
),
imageLocation:
'assets/images/al-habib_online_payment_service_icon.png',
- title: 'Covid-19- Drive-Thru Test',
+ title: TranslationBase.of(context).covid19_driveThrueTest,
),
ServicesContainer(
onTap: () {
@@ -227,7 +227,7 @@ class _AllHabibMedicalServiceState extends State {
),
),
imageLocation: 'assets/images/pharmacy_logo.png',
- title: 'Pharmacy'),
+ title: TranslationBase.of(context).pharmacy),
ServicesContainer(
onTap: () => Navigator.push(
context,
@@ -248,7 +248,7 @@ class _AllHabibMedicalServiceState extends State {
: EReferralPage()),
),
imageLocation: 'assets/images/ereferral_service_icon.png',
- title: 'E-Referral',
+ title: TranslationBase.of(context).ereferral,
),
ServicesContainer(
onTap: () => Navigator.push(
@@ -259,7 +259,7 @@ class _AllHabibMedicalServiceState extends State {
),
imageLocation:
'assets/images/new-design/family_menu_icon_red.png',
- title: 'My Family',
+ title: TranslationBase.of(context).myFamily,
),
if(projectViewModel.havePrivilege(35))
ServicesContainer(
@@ -269,7 +269,7 @@ class _AllHabibMedicalServiceState extends State {
),
imageLocation:
'assets/images/new-design/children_vaccines_icon.png',
- title: 'Child Vaccines',
+ title: TranslationBase.of(context).childVaccine,
),
ServicesContainer(
onTap: () => Navigator.push(
@@ -289,7 +289,7 @@ class _AllHabibMedicalServiceState extends State {
FadePage(page: SymptomInfo()),
),
imageLocation: 'assets/images/new-design/body_icon.png',
- title: 'Symptom Checker'),
+ title: TranslationBase.of(context).symptomCheckerTitle),
if(projectViewModel.havePrivilege(36))
ServicesContainer(
onTap: () => Navigator.push(
@@ -297,7 +297,7 @@ class _AllHabibMedicalServiceState extends State {
FadePage(page: BloodDonationPage()),
),
imageLocation: 'assets/images/new-design/blood_icon.png',
- title: 'Blood Donation',
+ title: TranslationBase.of(context).bloodD,
),
ServicesContainer(
onTap: () => Navigator.push(
@@ -308,7 +308,7 @@ class _AllHabibMedicalServiceState extends State {
),
imageLocation:
'assets/images/new-design/health_calculator_icon.png',
- title: 'Health Calculators',
+ title: TranslationBase.of(context).calculators,
),
ServicesContainer(
onTap: () => Navigator.push(
@@ -319,7 +319,7 @@ class _AllHabibMedicalServiceState extends State {
),
imageLocation:
'assets/images/new-design/health_convertor_icon.png',
- title: 'Health Converter',
+ title: TranslationBase.of(context).converters,
),
if(projectViewModel.havePrivilege(38))
ServicesContainer(
@@ -370,7 +370,7 @@ class _AllHabibMedicalServiceState extends State {
},
imageLocation:
'assets/images/new-design/twitter_dashboard_icon.png',
- title: 'Latest News',
+ title: TranslationBase.of(context).latestNews,
),
ServicesContainer(
onTap: () => Navigator.push(
diff --git a/lib/pages/ChildVaccines/add_newchild_page.dart b/lib/pages/ChildVaccines/add_newchild_page.dart
index 51b89f98..3c0d072b 100644
--- a/lib/pages/ChildVaccines/add_newchild_page.dart
+++ b/lib/pages/ChildVaccines/add_newchild_page.dart
@@ -11,6 +11,7 @@ import 'package:diplomaticquarterapp/pages/ChildVaccines/child_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/active_medications/DayCheckBoxDialog.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -84,10 +85,12 @@ class _AddNewChildPageState extends State {
@override
Widget build(BuildContext context) {
+ var size = MediaQuery.of(context).size;
+
return BaseView(
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
- appBarTitle: "Vaccintion",
+ appBarTitle: TranslationBase.of(context).vaccination,
body: SingleChildScrollView(
physics: ScrollPhysics(),
child: Container(
@@ -96,10 +99,10 @@ class _AddNewChildPageState extends State {
// crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
- height: 50,
+ height: 20,
),
Texts(
- "Add the child's information below to recieve the schedule of vaccinations.",
+ TranslationBase.of(context).vaccinationAddChildMsg,
//+model.user.firstName,
textAlign: TextAlign.center,
),
@@ -107,14 +110,14 @@ class _AddNewChildPageState extends State {
height: 12,
),
NewTextFields(
- hintText: "First Name",
+ hintText: TranslationBase.of(context).firstName,
controller: _firstTextController,
),
SizedBox(
height: 12,
),
NewTextFields(
- hintText: "Second Name",
+ hintText: TranslationBase.of(context).middleName,
controller: _secondTextController,
),
SizedBox(
@@ -124,62 +127,57 @@ class _AddNewChildPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
- "Gender:",
+ TranslationBase.of(context).gender,
textAlign: TextAlign.end,
),
],
),
Container(
- height: MediaQuery.of(context).size.height * 0.12,
width: double.infinity,
+ height: size.height * 0.12,
padding: EdgeInsets.all(12),
-
-
child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.center,
children: [
- Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: 175,
- color: Colors.white,
- child: SecondaryButton(
- textColor:
- checkedValue == 1 ? Colors.white : Colors.black,
- color: checkedValue == 1 ? Colors.red : Colors.white,
-
- label: "Male",
- //
- onTap: () {
+ Expanded(
+ child: Container(
+ color: Colors.white,
+ child: SecondaryButton(
+ textColor:
+ checkedValue == 1 ? Colors.white : Colors.black,
+ color: checkedValue == 1 ? Colors.red : Colors.white,
+ label: TranslationBase.of(context).male,
+ onTap: () {
+ setState(() {
+ checkedValue = 1;
+ print("checkedValue=" + checkedValue.toString());
+ });
- setState(() {
- checkedValue = 1;
- print("checkedValue=" + checkedValue.toString());
- });
-
- // bloodDetails.
- },
+ // bloodDetails.
+ },
+ ),
),
),
- Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: 175,
- color: Colors.white,
- child: SecondaryButton(
- textColor:
- checkedValue == 2 ? Colors.white : Colors.black,
- color: checkedValue == 2 ? Colors.red : Colors.white,
- label: "Female",
- //
- onTap: () {
- setState(() {
- checkedValue = 2;
- print("checkedValue=" + checkedValue.toString());
- });
- // bloodDetails.city=_selectedHospital.toString();
+ Expanded(
+ child: Container(
+ color: Colors.white,
+ child: SecondaryButton(
+ textColor:
+ checkedValue == 2 ? Colors.white : Colors.black,
+ color: checkedValue == 2 ? Colors.red : Colors.white,
+ label: TranslationBase.of(context).female,
+ //
+ onTap: () {
+ setState(() {
+ checkedValue = 2;
+ print("checkedValue=" + checkedValue.toString());
+ });
+ // bloodDetails.city=_selectedHospital.toString();
- // bloodDetails.
- },
+ // bloodDetails.
+ },
+ ),
),
)
],
@@ -193,7 +191,7 @@ class _AddNewChildPageState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
- "Date Of Birth::",
+ TranslationBase.of(context).dob,
textAlign: TextAlign.end,
),
],
@@ -249,29 +247,29 @@ class _AddNewChildPageState extends State {
color: checkedValue == false
? Colors.white24
: Color.fromRGBO(
- 63,
- 72,
- 74,
- 1,
- ),
- label: "Add",
+ 63,
+ 72,
+ 74,
+ 1,
+ ),
+ label: TranslationBase.of(context).add,
//
- onTap: () async{
- newChild.babyName = _firstTextController.text + " " + _secondTextController.text;
+ onTap: () async {
+ newChild.babyName = _firstTextController.text +
+ " " +
+ _secondTextController.text;
newChild.gender = checkedValue.toString();
newChild.strDOB = getStartDay();
newChild.tempValue = true;
newChild.isLogin = true;
await model.createNewBabyOrders(newChild: newChild);
- if(model.isAdded){
- AppToast.showSuccessToast(message: "Record Added");
- Navigator.pop(context,model.isAdded);
- }else{
-
+ if (model.isAdded) {
+ AppToast.showSuccessToast(message: TranslationBase.of(context).childAddedSuccessfully);
+ Navigator.pop(context, model.isAdded);
+ } else {
//TODO handling error
}
-
},
),
),
@@ -280,7 +278,7 @@ class _AddNewChildPageState extends State {
),
),
),
- // bottomSheet:
+ // bottomSheet:
),
);
}
diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart
index 806a5b71..ae33cc03 100644
--- a/lib/pages/ChildVaccines/child_page.dart
+++ b/lib/pages/ChildVaccines/child_page.dart
@@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'
import 'package:diplomaticquarterapp/pages/ChildVaccines/vaccinationtable_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -22,30 +23,51 @@ class ChildPage extends StatefulWidget {
class _ChildPageState extends State
with SingleTickerProviderStateMixin {
-
DeleteBaby deleteBaby = DeleteBaby();
@override
Widget build(BuildContext context) {
+ var size = MediaQuery.of(context).size;
+ final double height = (size.height - kToolbarHeight - 60);
+ final double itemWidth = size.width / 2;
+ final double itemHeight = height / 2 + 40;
+
var checkedValue = true;
return BaseView(
onModelReady: (model) => model.getNewUserOrders(),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: true,
- appBarTitle: " Vaccination",
+ appBarTitle: TranslationBase.of(context).vaccination,
baseViewModel: model,
- body: SingleChildScrollView(
- child: Container(
- margin: EdgeInsets.only(left: 15, right: 15, top: 70),
- child: Column(
- children: [
- ...List.generate(
+ body: Container(
+ height: height * 0.85,
+ child: SingleChildScrollView(
+ child: Container(
+ margin: EdgeInsets.only(left: 8, right: 8, top: 16),
+ child: GridView.count(
+ crossAxisCount: 2,
+ childAspectRatio: (itemWidth / (itemHeight + 0)),
+ crossAxisSpacing: 10,
+ mainAxisSpacing: 10,
+ controller: ScrollController(keepScrollOffset: true),
+ shrinkWrap: true,
+ padding: const EdgeInsets.all(4.0),
+ children: [
+ ...List.generate(
model.babyInformationModelList.length,
- (index) => Container(
- margin: EdgeInsets.only(
- left: 0, right: 0, bottom: 20),
-
- decoration: BoxDecoration(
+ (index) => InkWell(
+ onTap: () {
+ Navigator.push(
+ context,
+ FadePage(
+ page: VaccinationTablePage(model.babyInformationModelList[index]),
+ ),
+ );
+ },
+ child: Container(
+ margin: EdgeInsets.only(
+ left: 0, right: 0, bottom: 20),
+ decoration: BoxDecoration(
shape: BoxShape.rectangle,
border: Border.all(
color: Colors.white, width: 0.5),
@@ -54,11 +76,12 @@ class _ChildPageState extends State
color: Colors.white,
),
padding: EdgeInsets.all(12),
- width: 200,//double.infinity,
+ //double.infinity,
child: Column(
children: [
Row(children: [
- Texts("CHILD NAME"),
+ Texts(TranslationBase.of(context)
+ .childName),
]),
Row(children: [
Texts(model
@@ -96,19 +119,14 @@ class _ChildPageState extends State
Navigator.push(
context,
FadePage(
-
-
- page: VaccinationTablePage(),
-
-
+ page: VaccinationTablePage(model.babyInformationModelList[index]),
),
);
-
},
)
]),
Row(children: [
- Texts("Birthday"),
+ Texts(TranslationBase.of(context).dob),
]),
Row(children: [
IconButton(
@@ -116,9 +134,7 @@ class _ChildPageState extends State
'assets/images/new-design/calender-secondary.png'),
tooltip: '',
onPressed: () {
- setState(() {
-
- });
+ setState(() {});
},
),
Texts(DateUtil.yearMonthDay(model
@@ -130,73 +146,71 @@ class _ChildPageState extends State
icon: new Image.asset(
'assets/images/new-design/garbage.png'),
tooltip: '',
- onPressed: ()async {
-
+ onPressed: () async {
//=====================
- await model.deleteBabyOrders(newChild:deleteBaby );
-
+ await model.deleteBabyOrders(
+ newChild: deleteBaby);
- deleteBaby.babyID=model.babyInformationModelList[index]
+ deleteBaby.babyID = model
+ .babyInformationModelList[index]
.babyID;
- await model.deleteBabyOrders(newChild:deleteBaby );
- if(model.isDeleted){
- AppToast.showSuccessToast(message: "Record Deleted");
- Navigator.pop(context,model.isDeleted);
- }else{
-
- //TODO handling error
- }
-
-
-
-
-
+ await model.deleteBabyOrders(
+ newChild: deleteBaby);
+ if (model.isDeleted) {
+ AppToast.showSuccessToast(
+ message:
+ TranslationBase.of(context)
+ .recordDeleted);
+ Navigator.pop(
+ context, model.isDeleted);
+ } else {
+ //TODO handling error
+ }
},
),
- Texts("Delete"),
+ Texts(TranslationBase.of(context)
+ .deleteView),
]),
SizedBox(
height: 12,
),
],
),
-
+ ),
),
-
-
- )
- ],
- ))
+ )
+ ],
+ ))),
),
- bottomSheet: Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: double.infinity,
- padding: EdgeInsets.all(15),
- child: SecondaryButton(
- textColor: Colors.white,
- color: checkedValue == false
- ? Colors.white24
- : Color.fromRGBO(
- 63,
- 72,
- 74,
- 1,
- ),
- label: "ADD NEW CHILD ",
- //
- onTap: () {
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => AddNewChildPage(),
- ),
- ).then((value) {
- if (value) model.getNewUserOrders();
- });
- },
- ),
+ bottomSheet: Container(
+ height: height * 0.15,
+ width: double.infinity,
+ padding: EdgeInsets.all(16),
+ child: SecondaryButton(
+ textColor: Colors.white,
+ color: checkedValue == false
+ ? Colors.white24
+ : Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
),
+ label: TranslationBase.of(context).addNewChild,
+ //
+ onTap: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => AddNewChildPage(),
+ ),
+ ).then((value) {
+ if (value) model.getNewUserOrders();
+ });
+ },
+ ),
+ ),
));
}
}
diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart
index 92f3a0be..38c6b5af 100644
--- a/lib/pages/ChildVaccines/child_vaccines_page.dart
+++ b/lib/pages/ChildVaccines/child_vaccines_page.dart
@@ -1,10 +1,10 @@
-
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/user_information_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart';
import 'package:diplomaticquarterapp/pages/ChildVaccines/child_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
@@ -13,214 +13,218 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-
-
class ChildVaccinesPage extends StatefulWidget {
@override
_ChildVaccinesPageState createState() => _ChildVaccinesPageState();
}
class _ChildVaccinesPageState extends State
- with SingleTickerProviderStateMixin{
+ with SingleTickerProviderStateMixin {
TextEditingController titleController = TextEditingController();
- var checkedValue=false;
- String addEmail="";
+ var checkedValue = false;
+ String addEmail = "";
+
@override
Widget build(BuildContext context) {
-
return BaseView(
onModelReady: (model) => model.getUserInformationRequestOrders(),
builder: (_, model, w) => AppScaffold(
- isShowAppBar: true,
- baseViewModel: model,
- appBarTitle: " Vaccination",//TranslationBase.of(context).advancePayment,
- body: SingleChildScrollView(
- physics: ScrollPhysics(),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- SizedBox(
- height: 20,
- ),
-
- Padding(
- padding: const EdgeInsets.all(10.0),
- child:Container(
- child: Texts("Welcome back",fontSize: 20,),
- ) ,
- ),
- Divider(color:Colors.black , indent: 10,
- endIndent: 10,),
- SizedBox(
- height: 20,
- ),
- Padding(
- padding: const EdgeInsets.all(10.0),
- child:Container(
- child: Texts("Please ensure that the email address is up-to-date and process to view the schedule",fontSize: 20,),
- ) ,
+ isShowAppBar: true,
+ baseViewModel: model,
+ appBarTitle: TranslationBase.of(context).vaccination,
+ //TranslationBase.of(context).advancePayment,
+ body: SingleChildScrollView(
+ physics: ScrollPhysics(),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.spaceAround,
+ children: [
+ SizedBox(
+ height: 20,
+ ),
+ Padding(
+ padding: const EdgeInsets.all(10.0),
+ child: Container(
+ child: Texts(
+ TranslationBase.of(context).welcomeBack,
+ fontSize: 20,
),
-
- Divider(color:Colors.black , indent: 10,
- endIndent: 10,),
- Padding(
- padding: const EdgeInsets.all(10.0),
- child:Container(
-
- margin: EdgeInsets.only(left: 10, right: 10, top: 15),
- child: TextFields(
- fillColor: Colors.red,
-
- hintText: model.user.emailAddress,
- controller: titleController,
- fontSize: 20,
- hintColor: Colors.black,
- fontWeight: FontWeight.w600,
- onChanged: (text) {
- addEmail=text;
- model.user.emailAddress==addEmail?checkedValue=false:checkedValue=true;
-
-
- },
- validator: (value) {
-
- if (value == null)
- {
- return model.user.emailAddress;
-
- }
- else
-
- {
- return model.user.emailAddress;}
- },
- ),
- ),
+ ),
+ ),
+ Divider(
+ color: Colors.black,
+ indent: 10,
+ endIndent: 10,
+ ),
+ SizedBox(
+ height: 20,
+ ),
+ Padding(
+ padding: const EdgeInsets.all(10.0),
+ child: Container(
+ child: Texts(
+ TranslationBase.of(context).msg_email_address_up_to_date,
+ fontSize: 20,
),
- Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: double.infinity,
-
- padding: EdgeInsets.all(15),
- child: SecondaryButton(
- textColor: Colors.white,
- color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,),
- label: "UPDATE EMAIL",
- //
- onTap: (){
- model.user.emailAddress=addEmail.toString();
- AppToast.showSuccessToast(
- message: "Email updated");
- // bloodDetails.city=_selectedHospital.toString();
-
- // bloodDetails.
- },
-
+ ),
+ ),
- ),
+ Divider(
+ color: Colors.black,
+ indent: 10,
+ endIndent: 10,
+ ),
+ Padding(
+ padding: const EdgeInsets.all(10.0),
+ child: Container(
+ margin: EdgeInsets.only(left: 10, right: 10, top: 15),
+ child: TextFields(
+ fillColor: Colors.red,
+ hintText: model.user.emailAddress,
+ controller: titleController,
+ fontSize: 20,
+ hintColor: Colors.black,
+ fontWeight: FontWeight.w600,
+ onChanged: (text) {
+ addEmail = text;
+ model.user.emailAddress == addEmail
+ ? checkedValue = false
+ : checkedValue = true;
+ },
+ validator: (value) {
+ if (value == null) {
+ return model.user.emailAddress;
+ } else {
+ return model.user.emailAddress;
+ }
+ },
),
- Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: double.infinity,
-
- padding: EdgeInsets.all(15),
- child: SecondaryButton(
- textColor: Colors.white,
- color: Color.fromRGBO(63, 72, 74, 1,),
- label: " VIEW LIST OF CHILDREN",
- //
- onTap: () => Navigator.push(
- context,
- FadePage(
- page: ChildPage(),
-
-
-
- ),
+ ),
+ ),
+ Container(
+ height: MediaQuery.of(context).size.height * 0.12,
+ width: double.infinity,
+ padding: EdgeInsets.all(15),
+ child: SecondaryButton(
+ textColor: Colors.white,
+ color: checkedValue == false
+ ? Colors.white24
+ : Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
),
-
-
- ),
- ),
-
- // Texts(
- // // TranslationBase.of(context).advancePaymentLabel,
- // model.user.emailAddress,
- // textAlign: TextAlign.center,
- // ),
- SizedBox(
- height: 12,
- ),
- SizedBox(
- height: 12,
- ),
- SizedBox(
- height: 12,
+ label: TranslationBase.of(context).updateEmail,
+ //
+ onTap: () {
+ model.user.emailAddress = addEmail.toString();
+ AppToast.showSuccessToast(
+ message: TranslationBase.of(context).updateEmailMsg);
+ // bloodDetails.city=_selectedHospital.toString();
+
+ // bloodDetails.
+ },
+ ),
+ ),
+ Container(
+ height: MediaQuery.of(context).size.height * 0.12,
+ width: double.infinity,
+ padding: EdgeInsets.all(15),
+ child: SecondaryButton(
+ textColor: Colors.white,
+ color: Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
),
-
- SizedBox(
- height: 12,
+ label: TranslationBase.of(context).viewListChildren,
+ //
+ onTap: () => Navigator.push(
+ context,
+ FadePage(
+ page: ChildPage(),
+ ),
),
+ ),
+ ),
- SizedBox(
- height: 12,
- ),
+ // Texts(
+ // // TranslationBase.of(context).advancePaymentLabel,
+ // model.user.emailAddress,
+ // textAlign: TextAlign.center,
+ // ),
+ SizedBox(
+ height: 12,
+ ),
+ SizedBox(
+ height: 12,
+ ),
+ SizedBox(
+ height: 12,
+ ),
- SizedBox(
- height: 10,
- ),
- // Row(
- // mainAxisAlignment: MainAxisAlignment.center,
- // crossAxisAlignment: CrossAxisAlignment.center,
- // children: [
- // Center(
- // child: Container(
- // color: Colors.white,
- // width: 350,
- // child: InkWell(
- // onTap: () {
- // showDialog(
- // context: context,
- // builder: (_) =>
- // AssetGiffyDialog(
- // title: Text(
- // "",
- // style: TextStyle(
- // fontSize: 22.0,
- // fontWeight:
- // FontWeight
- // .w600),
- // ),
- // image: Image.asset(
- // 'assets/images/BloodChrt_EN.png'),
- // buttonCancelText:
- // Text('cancel'),
- // buttonCancelColor:
- // Colors.grey,
- // onlyCancelButton: true,
- // ));
- // },
- // child: Container(
- // width: 250,
- // height: 200,
- // child:Image.asset(
- // 'assets/images/BloodChrt_EN.png')),
- // ),
- // ),
- // ),
- // ],
- // ),
+ SizedBox(
+ height: 12,
+ ),
- SizedBox(
- height: MediaQuery.of(context).size.height * 0.15,
- )
- ],
+ SizedBox(
+ height: 12,
),
+ SizedBox(
+ height: 10,
+ ),
+ // Row(
+ // mainAxisAlignment: MainAxisAlignment.center,
+ // crossAxisAlignment: CrossAxisAlignment.center,
+ // children: [
+ // Center(
+ // child: Container(
+ // color: Colors.white,
+ // width: 350,
+ // child: InkWell(
+ // onTap: () {
+ // showDialog(
+ // context: context,
+ // builder: (_) =>
+ // AssetGiffyDialog(
+ // title: Text(
+ // "",
+ // style: TextStyle(
+ // fontSize: 22.0,
+ // fontWeight:
+ // FontWeight
+ // .w600),
+ // ),
+ // image: Image.asset(
+ // 'assets/images/BloodChrt_EN.png'),
+ // buttonCancelText:
+ // Text('cancel'),
+ // buttonCancelColor:
+ // Colors.grey,
+ // onlyCancelButton: true,
+ // ));
+ // },
+ // child: Container(
+ // width: 250,
+ // height: 200,
+ // child:Image.asset(
+ // 'assets/images/BloodChrt_EN.png')),
+ // ),
+ // ),
+ // ),
+ // ],
+ // ),
+
+ SizedBox(
+ height: MediaQuery.of(context).size.height * 0.15,
+ )
+ ],
),
- ),
+ ),
+ ),
);
}
}
-
diff --git a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart
index 259bbdb7..c08749b8 100644
--- a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart
+++ b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart
@@ -7,8 +7,11 @@ import 'package:flutter/material.dart';
class SelectGenderDialog extends StatefulWidget {
final Email;
+ final Function okFunction;
+
+ const SelectGenderDialog({Key key, this.Email, this.okFunction})
+ : super(key: key);
- const SelectGenderDialog({Key key, this.Email}) : super(key: key);
@override
_SelectGenderDialogState createState() => _SelectGenderDialogState();
}
@@ -33,9 +36,8 @@ class _SelectGenderDialogState extends State {
});
},
child: ListTile(
- title: Text("Send the child's schedule to the email\n Tamer.dasdasdas@gmail.com "),
-
-
+ title: Text(
+ "${TranslationBase.of(context).sendChildEmailMsg}\n Tamer.dasdasdas@gmail.com "),
),
),
)
@@ -44,7 +46,6 @@ class _SelectGenderDialogState extends State {
SizedBox(
height: 5.0,
),
-
SizedBox(
height: 5.0,
),
@@ -82,7 +83,7 @@ class _SelectGenderDialogState extends State {
flex: 1,
child: InkWell(
onTap: () {
- AppToast.showSuccessToast(message: "Email Sended");
+ widget.okFunction();
// widget.onValueSelected(beneficiaryType);
Navigator.pop(context);
},
@@ -105,7 +106,4 @@ class _SelectGenderDialogState extends State {
],
);
}
-
-
-
}
diff --git a/lib/pages/ChildVaccines/vaccinationtable_page.dart b/lib/pages/ChildVaccines/vaccinationtable_page.dart
index c160acfb..7b8499e0 100644
--- a/lib/pages/ChildVaccines/vaccinationtable_page.dart
+++ b/lib/pages/ChildVaccines/vaccinationtable_page.dart
@@ -1,8 +1,13 @@
+import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
+import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/vaccination_table_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/reports_monthly_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
+import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@@ -12,91 +17,161 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'dialogs/SelectGenderDialog.dart';
class VaccinationTablePage extends StatelessWidget {
+ final List_BabyInformationModel babyInfo;
+
+ VaccinationTablePage(this.babyInfo);
+
@override
Widget build(BuildContext context) {
+ var size = MediaQuery.of(context).size;
+ final double height = (size.height - kToolbarHeight - 60);
+
var checkedValue;
return BaseView(
- onModelReady: (model) => model.getCreateVaccinationTable(),//getUserTermsAndConditions(),
+ onModelReady: (model) => model.getCreateVaccinationTable(babyInfo, false),
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
baseViewModel: model,
- appBarTitle: "Vaccination",
- body: SingleChildScrollView(
- child:Container(
- margin: EdgeInsets.only(left: 15,right: 15,top: 70),
- child: Column(
- children: [//babyInformationModelList.length
- ...List.generate(model.creteVaccinationTableModelList.length, (index) =>
- Container(
- decoration: BoxDecoration(
- shape: BoxShape.rectangle,
- border: Border.all(color: Colors.white, width: 0.5),
- borderRadius: BorderRadius.all(Radius.circular(5)),
- color: Colors.white,
-
- ),
- padding: EdgeInsets.all(12),
- width: double.infinity,
- child: Column(
-
- children: [
- Row(children: [
- Text(model.creteVaccinationTableModelList[index].visit),
- SizedBox(width: 10,),
-
- Expanded(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Html(
- // data:""//model.creteVaccinationTableModelList[index].vaccinesDescription
- data:model.creteVaccinationTableModelList[index].vaccinesDescription,
-
- ),
- ],),
- ),
- Text(model.creteVaccinationTableModelList[index].givenAt),
-
-
- ],),
- Divider(color:Colors.black ,),
-
- ],
- )
-
-
- )
-
- )
- ],
+ appBarTitle: TranslationBase.of(context).vaccination,
+ body: Container(
+ height: height * 0.85,
+ child: SingleChildScrollView(
+ child: Container(
+ margin: EdgeInsets.only(left: 16, right: 16, top: 16),
+ child: Column(
+ children: [
+ Row(
+ children: [
+ Expanded(
+ child: Texts(TranslationBase.of(context).childName),
+ ),
+ Expanded(
+ child: Texts(TranslationBase.of(context).dob),
+ ),
+ ],
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ Row(
+ children: [
+ Expanded(
+ child: Texts(babyInfo.babyName),
+ ),
+ Expanded(
+ child: Texts(DateUtil.getFormattedDate(
+ babyInfo.dOB, "MMM dd,yyyy")),
+ ),
+ ],
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ Divider(
+ color: Colors.black,
+ ),
+ Row(
+ children: [
+ Text(TranslationBase.of(context).visit),
+ SizedBox(
+ width: 25,
+ ),
+ Expanded(
+ child: Text(TranslationBase.of(context).description)),
+ Text(TranslationBase.of(context).dueDate),
+ ],
+ ),
+ ...List.generate(
+ model.creteVaccinationTableModelList.length,
+ (index) => Container(
+ decoration: BoxDecoration(
+ shape: BoxShape.rectangle,
+ // border: Border.all(color: Colors.white, width: 0.5),
+ borderRadius: BorderRadius.all(Radius.circular(5)),
+ // color: Colors.white,
+ ),
+ padding: EdgeInsets.all(12),
+ width: double.infinity,
+ child: Column(
+ children: [
+ Row(
+ children: [
+ Text(model
+ .creteVaccinationTableModelList[index]
+ .visit),
+ SizedBox(
+ width: 10,
+ ),
+ Expanded(
+ child: Column(
+ mainAxisAlignment:
+ MainAxisAlignment.start,
+ crossAxisAlignment:
+ CrossAxisAlignment.start,
+ children: [
+ Html(
+ // data:""//model.creteVaccinationTableModelList[index].vaccinesDescription
+ data: model
+ .creteVaccinationTableModelList[
+ index]
+ .vaccinesDescription,
+ ),
+ ],
+ ),
+ ),
+ Text(model
+ .creteVaccinationTableModelList[index]
+ .givenAt),
+ ],
+ ),
+ Divider(
+ color: Colors.black,
+ ),
+ ],
+ )))
+ ],
+ ),
),
-
+ ),
),
- ),
bottomSheet: Container(
- height: MediaQuery.of(context).size.height * 0.12,
+ height: height * 0.15,
width: double.infinity,
-
padding: EdgeInsets.all(12),
child: SecondaryButton(
- textColor: Colors.white,
- color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,),
- label: "Send Email ",
- //
- onTap: () {
- //SelectGenderDialog();
+ textColor: Colors.white,
+ color: checkedValue == false
+ ? Colors.white24
+ : Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
+ ),
+ label: TranslationBase.of(context).sendEmail,
+ //
+ onTap: () {
+ //SelectGenderDialog();
//===============
- showDialog(
- context: context,
- child: SelectGenderDialog(
- ),
- );
- //=========
- }
-
-
- ),
+ showDialog(
+ context: context,
+ child: SelectGenderDialog(
+ okFunction: () async {
+ await model.getCreateVaccinationTable(babyInfo, true);
+ if (model.state == ViewState.Idle) {
+ AppToast.showSuccessToast(
+ message: TranslationBase.of(context)
+ .emailSentSuccessfully);
+ } else {
+ AppToast.showErrorToast(
+ message: TranslationBase.of(context)
+ .EmailSentError);
+ }
+ },
+ ),
+ );
+ //=========
+ }),
),
),
);
diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart
index e1dd6b63..eabff77a 100644
--- a/lib/pages/landing/landing_page.dart
+++ b/lib/pages/landing/landing_page.dart
@@ -158,12 +158,14 @@ class _LandingPageState extends State with WidgetsBindingObserver {
});
}).checkAndConnectIfNoInternet();
+
if (Platform.isIOS) {
_firebaseMessaging.requestNotificationPermissions();
}
- // Flip Permission Checks [Zohaib Kambrani]
requestPermissions().then((results) {
+ registerGeofences();
+
if (results[Permission.notification].isGranted)
_firebaseMessaging.getToken().then((String token) {
sharedPref.setString(PUSH_TOKEN, token);
@@ -172,7 +174,6 @@ class _LandingPageState extends State with WidgetsBindingObserver {
checkUserStatus(token);
}
});
-
if (results[Permission.location].isGranted);
if (results[Permission.storage].isGranted);
if (results[Permission.camera].isGranted);
@@ -376,17 +377,6 @@ class _LandingPageState extends State with WidgetsBindingObserver {
// themeNotifier.setTheme(defaultTheme);
}
- void checkUserStatus(token, {isLoader = true}) async {
- if (isLoader)
- //GifLoaderDialogUtils.showMyDialog(context);
- authService
- .selectDeviceImei(token)
- .then((SelectDeviceIMEIRES value) => setUserValues(value))
- .catchError((err) {
- //GifLoaderDialogUtils.hideDialog(context);
- });
- }
-
static Future myBackgroundMessageHandler(
Map message) async {
Map myMap = new Map.from(message['data']);
@@ -438,7 +428,6 @@ class _LandingPageState extends State with WidgetsBindingObserver {
});
}
- requestPermissions().then((results) {});
}
login() async {
@@ -620,11 +609,31 @@ class _LandingPageState extends State with WidgetsBindingObserver {
case 3:
return TranslationBase.of(context).services;
case 4:
- return TranslationBase
- .of(context)
- .bookAppo;
+ return TranslationBase.of(context).bookAppo;
}
}
-}
+ void checkUserStatus(token, {isLoader = true}) async {
+ if (isLoader)
+ //GifLoaderDialogUtils.showMyDialog(context);
+ authService
+ .selectDeviceImei(token)
+ .then((SelectDeviceIMEIRES value) => setUserValues(value))
+ .catchError((err) {
+ //GifLoaderDialogUtils.hideDialog(context);
+ });
+
+ // if (await sharedPref.getObject(USER_PROFILE) != null) {
+ // var data = AuthenticatedUser.fromJson(await sharedPref.getObject(USER_PROFILE));
+ // if (data != null) {
+ // authService.registeredAuthenticatedUser(data, token, 0, 0).then((res) => {print(res)});
+ // authService.getDashboard().then((value) => {
+ // setState(() {
+ // notificationCount = value['List_PatientDashboard'][0]['UnreadPatientNotificationCount'].toString();
+ // })
+ // });
+ // }
+ // }
+ }
+}
diff --git a/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart b/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
index 43bc9f0a..b09a579d 100644
--- a/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
+++ b/lib/pages/medical/vital_sign/vital_sing_chart_and_detials.dart
@@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/model/vital_sign/vital_sign_res_model.dart';
import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_wideget.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/widgets/charts/app_time_series_chart.dart';
import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart';
import 'package:flutter/material.dart';
diff --git a/lib/pages/pharmacy/order/Order.dart b/lib/pages/pharmacy/order/Order.dart
index 576bf2a0..5bb4ea42 100644
--- a/lib/pages/pharmacy/order/Order.dart
+++ b/lib/pages/pharmacy/order/Order.dart
@@ -924,6 +924,7 @@ class _OrderPageState extends State with SingleTickerProviderStateMix
}
Widget getCancelledOrder(OrderModelViewModel model){
+
for(int i=0 ; i< model.order.length; i++){
if( model.order[i].orderStatusId == 40 || model.order[i].orderStatusId == 996
|| model.order[i].orderStatusId == 200){
@@ -1136,13 +1137,17 @@ class _OrderPageState extends State with SingleTickerProviderStateMix
),
),
);
- }
+ int test = Test()["1"];
+ }
}
-
-
-
-
-
+class Test{
+ static const values = {
+ "1":1,
+ "2":2,
+ "3":3
+ };
+ int operator [](String key) => values[key];
+}
\ No newline at end of file
diff --git a/lib/pages/pharmacy/order/OrderDetails.dart b/lib/pages/pharmacy/order/OrderDetails.dart
index 5438663d..d5d064a7 100644
--- a/lib/pages/pharmacy/order/OrderDetails.dart
+++ b/lib/pages/pharmacy/order/OrderDetails.dart
@@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart';
+import 'package:diplomaticquarterapp/pages/pharmacy/order/TrackDriver.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -46,6 +47,7 @@ class _OrderDetailsPageState extends State {
var model;
var isCancel = false;
var isRefund = false;
+ var isActiveDelivery = true;
var dataIsCancel;
var dataIsRefund;
@@ -105,9 +107,9 @@ class _OrderDetailsPageState extends State {
color: getStatusBackgroundColor(),
borderRadius: BorderRadius.circular(30.0)),
child: Text(
- languageID == "ar"
- ? widget.orderModel.orderStatusn.toString():
- widget.orderModel.orderStatus.toString().substring(12) ,
+ languageID == "ar"
+ ? widget.orderModel.orderStatusn.toString():
+ widget.orderModel.orderStatus.toString().substring(12) ,
// TranslationBase.of(context).delivered,
style: TextStyle(
color: Colors.white,
@@ -125,8 +127,8 @@ class _OrderDetailsPageState extends State {
children: [
Text(
widget.orderModel.shippingAddress.firstName
- .toString()
- .substring(10) +
+ .toString()
+ .substring(10) +
' ' +
widget.orderModel.shippingAddress.lastName
.toString()
@@ -141,18 +143,18 @@ class _OrderDetailsPageState extends State {
Container(
margin: EdgeInsets.fromLTRB(10.0, 5.0, 1.0, 5.0),
child: Row(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- widget.orderModel.shippingAddress.address1
- .toString()
- .substring(9),
- style: TextStyle(
- fontSize: 10.0,
- fontWeight: FontWeight.bold,
- color: Colors.grey,
- ),
- ),]
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ widget.orderModel.shippingAddress.address1
+ .toString()
+ .substring(9),
+ style: TextStyle(
+ fontSize: 10.0,
+ fontWeight: FontWeight.bold,
+ color: Colors.grey,
+ ),
+ ),]
),
),
Container(
@@ -162,8 +164,8 @@ class _OrderDetailsPageState extends State {
children: [
Text(
widget.orderModel.shippingAddress.address2
- .toString()
- .substring(9) +
+ .toString()
+ .substring(9) +
' ' +
widget.orderModel.shippingAddress.country
.toString() +
@@ -231,7 +233,7 @@ class _OrderDetailsPageState extends State {
Container(
child: flutterImage.Image.asset(
widget.orderModel.shippingRateComputationMethodSystemName !=
- "Shipping.Aramex"
+ "Shipping.Aramex"
? "assets/images/pharmacy_module/payment/LogoParmacyGreen.png"
: "assets/images/pharmacy_module/payment/aramex_shipping_logo.png",
fit: BoxFit.contain,
@@ -320,19 +322,19 @@ class _OrderDetailsPageState extends State {
physics: ScrollPhysics(),
itemCount:widget.orderModel.orderItems.length,
itemBuilder: (context, index){
- return Container(
- child: productTile(productName: widget.orderModel.orderItems[index].product.name.toString(),
- productPrice: widget.orderModel.orderItems[index].product.price.toString(),
- productRate: widget.orderModel.orderItems[index].product.approvedRatingSum.toDouble(),
- productReviews:widget.orderModel.orderItems[index].product.approvedTotalReviews,
- totalPrice: "${(widget.orderModel.orderItems[index].product.price
- * widget.orderModel.orderItems[index].quantity).toStringAsFixed(2)}",
- qyt: widget.orderModel.orderItems[index].quantity.toString(),
- isOrderDetails:true,
- imgs: widget.orderModel.orderItems[index].product.images != null &&
- widget.orderModel.orderItems[index].product.images.length != 0
- ? widget.orderModel.orderItems[index].product.images [0].src.toString()
- : null,
+ return Container(
+ child: productTile(productName: widget.orderModel.orderItems[index].product.name.toString(),
+ productPrice: widget.orderModel.orderItems[index].product.price.toString(),
+ productRate: widget.orderModel.orderItems[index].product.approvedRatingSum.toDouble(),
+ productReviews:widget.orderModel.orderItems[index].product.approvedTotalReviews,
+ totalPrice: "${(widget.orderModel.orderItems[index].product.price
+ * widget.orderModel.orderItems[index].quantity).toStringAsFixed(2)}",
+ qyt: widget.orderModel.orderItems[index].quantity.toString(),
+ isOrderDetails:true,
+ imgs: widget.orderModel.orderItems[index].product.images != null &&
+ widget.orderModel.orderItems[index].product.images.length != 0
+ ? widget.orderModel.orderItems[index].product.images [0].src.toString()
+ : null,
status: widget.orderModel.orderStatusId,
product: widget.orderModel.orderItems[index].product,
),
@@ -510,58 +512,81 @@ class _OrderDetailsPageState extends State {
),
widget.orderModel.orderStatusId == 10
? InkWell(
- onTap: () {
- model.makeOrder();
- },
- child: Container(
+ onTap: () {
+ model.makeOrder();
+ },
+ child: Container(
// margin: EdgeInsets.only(top: 20.0),
- height: 50.0,
- color: Colors.transparent,
- child: Container(
- padding: EdgeInsets.only(left: 130.0, right: 130.0),
- decoration: BoxDecoration(
- border: Border.all(
- color: Colors.green,
- style: BorderStyle.solid,
- width: 4.0),
- color: Colors.green,
- borderRadius: BorderRadius.circular(5.0)),
- child: Center(
- child: Text(
- TranslationBase.of(context).payOnline,
- style: TextStyle(
- color: Colors.white,
- fontWeight: FontWeight.bold,
- ),
- ),
- ),
+ height: 50.0,
+ color: Colors.transparent,
+ child: Container(
+ padding: EdgeInsets.only(left: 130.0, right: 130.0),
+ decoration: BoxDecoration(
+ border: Border.all(
+ color: Colors.green,
+ style: BorderStyle.solid,
+ width: 4.0),
+ color: Colors.green,
+ borderRadius: BorderRadius.circular(5.0)),
+ child: Center(
+ child: Text(
+ TranslationBase.of(context).payOnline,
+ style: TextStyle(
+ color: Colors.white,
+ fontWeight: FontWeight.bold,
),
),
- )
+ ),
+ ),
+ ),
+ )
: Container(),
// getCancelOrder(canCancel, canRefund),
isCancel
? InkWell(
- onTap: () {
- presentConfirmDialog(model,
- widget.orderModel.id); //(widget.orderModel.id));
+ onTap: () {
+ presentConfirmDialog(model,
+ widget.orderModel.id); //(widget.orderModel.id));
//
- },
- child: Container(
+ },
+ child: Container(
// padding: EdgeInsets.only(left: 13.0, right: 13.0, top: 5.0),
- height: 50.0,
- color: Colors.transparent,
- child: Center(
- child: Text(
- TranslationBase.of(context).cancelOrder,
- style: TextStyle(
- color: Colors.red[900],
- fontWeight: FontWeight.bold,
- decoration: TextDecoration.underline),
- ),
- ),
- ),
- )
+ height: 50.0,
+ color: Colors.transparent,
+ child: Center(
+ child: Text(
+ TranslationBase.of(context).cancelOrder,
+ style: TextStyle(
+ color: Colors.red[900],
+ fontWeight: FontWeight.bold,
+ decoration: TextDecoration.underline),
+ ),
+ ),
+ ),
+ )
+ : Container(),
+ isActiveDelivery
+ ? InkWell(
+ onTap: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(builder: (context) => TrackDriver(order: widget.orderModel),
+ ));
+ },
+ child: Container(
+ height: 50.0,
+ color: Colors.transparent,
+ child: Center(
+ child: Text(
+ TranslationBase.of(context).trackDeliveryDriver,
+ style: TextStyle(
+ color: Colors.green[900],
+ fontWeight: FontWeight.normal,
+ decoration: TextDecoration.none),
+ ),
+ ),
+ ),
+ )
: Container(),
],
),
diff --git a/lib/pages/pharmacy/order/TrackDriver.dart b/lib/pages/pharmacy/order/TrackDriver.dart
new file mode 100644
index 00000000..b9a8056f
--- /dev/null
+++ b/lib/pages/pharmacy/order/TrackDriver.dart
@@ -0,0 +1,211 @@
+import 'dart:async';
+
+import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_polyline_points/flutter_polyline_points.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+import 'package:location/location.dart';
+
+
+class TrackDriver extends StatefulWidget {
+ final OrderModel order;
+ TrackDriver({this.order});
+
+ @override
+ State createState() => _TrackDriverState();
+}
+
+class _TrackDriverState extends State {
+ OrderModel _order;
+
+ Completer _controller = Completer();
+
+
+ double CAMERA_ZOOM = 16;
+ double CAMERA_TILT = 0;
+ double CAMERA_BEARING = 30;
+ LatLng SOURCE_LOCATION = null;
+ LatLng DEST_LOCATION = null;
+
+ // for my drawn routes on the map
+ Set _polylines = Set();
+ List polylineCoordinates = [];
+ PolylinePoints polylinePoints;
+
+ Set _markers = Set();
+
+ BitmapDescriptor sourceIcon; // for my custom marker pins
+ BitmapDescriptor destinationIcon; // for my custom marker pins
+ Location location;// wrapper around the location API
+
+ @override
+ void initState() {
+ _order = widget.order;
+ DEST_LOCATION = _order.shippingAddress.getLocation();
+ location = new Location();
+ polylinePoints = PolylinePoints();
+ setSourceAndDestinationIcons();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return new Scaffold(
+ body: GoogleMap(
+ myLocationEnabled: true,
+ compassEnabled: true,
+ markers: _markers,
+ polylines: _polylines,
+ mapType: MapType.normal,
+ initialCameraPosition: _orderDeliveryLocationCamera(),
+ onMapCreated: (GoogleMapController controller) {
+ _controller.complete(controller);
+ showPinsOnMap();
+ },
+ ),
+ floatingActionButton: FloatingActionButton.extended(
+ onPressed: _goToDriver,
+ label: Text('To the lake!'),
+ icon: Icon(Icons.directions_boat),
+ ),
+ );
+ }
+
+
+ void setSourceAndDestinationIcons() async {
+ sourceIcon = await BitmapDescriptor.fromAssetImage(
+ ImageConfiguration(devicePixelRatio: 2.5),
+ 'assets/images/map_markers/source_map_marker.png');
+
+ destinationIcon = await BitmapDescriptor.fromAssetImage(
+ ImageConfiguration(devicePixelRatio: 2.5),
+ 'assets/images/map_markers/destination_map_marker.png');
+ }
+
+ CameraPosition _orderDeliveryLocationCamera(){
+
+ final CameraPosition orderDeliveryLocCamera = CameraPosition(
+ bearing: CAMERA_BEARING,
+ target: DEST_LOCATION,
+ tilt: CAMERA_TILT,
+ zoom: CAMERA_ZOOM);
+ return orderDeliveryLocCamera;
+ }
+
+ CameraPosition _driverLocationCamera(){
+ final CameraPosition driverLocCamera = CameraPosition(
+ bearing: CAMERA_BEARING,
+ target: SOURCE_LOCATION,
+ tilt: CAMERA_TILT,
+ zoom: CAMERA_ZOOM);
+ return driverLocCamera;
+ }
+
+
+ Future _goToOrderDeliveryLocation() async {
+ final GoogleMapController controller = await _controller.future;
+ final CameraPosition orderDeliveryLocCamera = _orderDeliveryLocationCamera();
+ controller.animateCamera(CameraUpdate.newCameraPosition(orderDeliveryLocCamera));
+ }
+
+ Future _goToDriver() async {
+ final GoogleMapController controller = await _controller.future;
+ final CameraPosition driverLocCamera = _driverLocationCamera();
+ controller.animateCamera(CameraUpdate.newCameraPosition(driverLocCamera));
+ }
+
+
+ Future _fitCameraBetweenBothPoints() async {
+ final GoogleMapController controller = await _controller.future;
+ final CameraPosition driverLocCamera = CameraPosition(
+ bearing: CAMERA_BEARING,
+ target: SOURCE_LOCATION,
+ tilt: CAMERA_TILT,
+ zoom: CAMERA_ZOOM);
+ controller.animateCamera(CameraUpdate.newCameraPosition(driverLocCamera));
+ }
+
+ void showPinsOnMap() {
+ // source pin
+ if(SOURCE_LOCATION != null){
+ setState(() {
+ var pinPosition = SOURCE_LOCATION;
+ _markers.add(Marker(
+ markerId: MarkerId('sourcePin'),
+ position: pinPosition,
+ icon: sourceIcon
+ ));
+ });
+ }
+
+ // destination pin
+ if(DEST_LOCATION != null){
+ setState(() {
+ var destPosition = DEST_LOCATION;
+ _markers.add(Marker(
+ markerId: MarkerId('destPin'),
+ position: destPosition,
+ icon: destinationIcon
+ ));
+ });
+ }
+ // set the route lines on the map from source to destination
+ // for more info follow this tutorial
+ // drawRoute();
+ }
+
+ void updatePinOnMap() async {
+ // create a new CameraPosition instance
+ // every time the location changes, so the camera
+ // follows the pin as it moves with an animation
+ CameraPosition cPosition = CameraPosition(
+ zoom: CAMERA_ZOOM,
+ tilt: CAMERA_TILT,
+ bearing: CAMERA_BEARING,
+ target: SOURCE_LOCATION,
+ );
+ final GoogleMapController controller = await _controller.future;
+ controller.animateCamera(CameraUpdate.newCameraPosition(cPosition));
+ // do this inside the setState() so Flutter gets notified
+ // that a widget update is due
+ setState(() {
+ // updated position
+ var pinPosition = SOURCE_LOCATION;
+
+ // the trick is to remove the marker (by id)
+ // and add it again at the updated location
+ _markers.removeWhere((m) => m.markerId.value == 'sourcePin');
+ _markers.add(Marker(
+ markerId: MarkerId('sourcePin'),
+ position: pinPosition, // updated position
+ icon: sourceIcon
+ ));
+ });
+ }
+
+ void drawRoute() async {
+ return; // Ignore draw Route
+
+ List result = await polylinePoints.getRouteBetweenCoordinates(
+ GOOGLE_API_KEY,
+ SOURCE_LOCATION.latitude,
+ SOURCE_LOCATION.longitude,
+ DEST_LOCATION.latitude,
+ DEST_LOCATION.longitude);
+ if(result.isNotEmpty){
+ result.forEach((PointLatLng point){
+ polylineCoordinates.add(
+ LatLng(point.latitude,point.longitude)
+ );
+ });
+ setState(() {
+ _polylines.add(Polyline(
+ width: 5, // set the width of the polylines
+ polylineId: PolylineId('poly'),
+ color: Color.fromARGB(255, 40, 122, 198),
+ points: polylineCoordinates
+ ));
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/lib/uitl/HMGNetworkConnectivity.dart b/lib/uitl/HMGNetworkConnectivity.dart
index 228edf93..c4044573 100644
--- a/lib/uitl/HMGNetworkConnectivity.dart
+++ b/lib/uitl/HMGNetworkConnectivity.dart
@@ -47,18 +47,28 @@ class HMGNetworkConnectivity {
void confirmFromUser() {
TranslationBase translator = TranslationBase.of(context);
- ConfirmDialog(
- context: context,
- confirmMessage: translator.wantToConnectWithHmgNetwork,
- okText: translator.yes,
- okFunction: () {
- ConfirmDialog.closeAlertDialog(context);
- callBack();
- },
- cancelText: translator.no,
- cancelFunction: () {
- ConfirmDialog.closeAlertDialog(context);
- }).showAlertDialog(context);
+
+ void doIt() {
+ ConfirmDialog(
+ context: context,
+ confirmMessage: translator.wantToConnectWithHmgNetwork,
+ okText: translator.yes,
+ okFunction: () {
+ ConfirmDialog.closeAlertDialog(context);
+ callBack();
+ },
+ cancelText: translator.no,
+ cancelFunction: () {
+ ConfirmDialog.closeAlertDialog(context);
+ }).showAlertDialog(context);
+ }
+
+ if (Platform.isAndroid)
+ Wifi.list(SSID).then((value) {
+ if (!value.indexWhere((element) => element.ssid == SSID).isNegative) doIt();
+ });
+ else
+ doIt();
}
void showFailDailog(String message) {
diff --git a/lib/uitl/date_uitl.dart b/lib/uitl/date_uitl.dart
index 460a4066..9f959885 100644
--- a/lib/uitl/date_uitl.dart
+++ b/lib/uitl/date_uitl.dart
@@ -4,7 +4,7 @@ import 'package:intl/intl.dart';
class DateUtil {
/// convert String To Date function
/// [date] String we want to convert
- static DateTime convertStringToDate(String date) {
+ static DateTime convertStringToDate(String date) { // /Date(1585774800000+0300)/
if (date != null) {
const start = "/Date(";
const end = "+0300)";
diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart
index b9be8fe4..db5457f7 100644
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@@ -550,6 +550,7 @@ class TranslationBase {
localizedValues['Prescriptions'][locale.languageCode];
String get history => localizedValues['History'][locale.languageCode];
String get orderNo => localizedValues['OrderNo'][locale.languageCode];
+ String get trackDeliveryDriver => localizedValues['trackDeliveryDriver'][locale.languageCode];
String get orderDetails =>
localizedValues['OrderDetails'][locale.languageCode];
String get vitalSign => localizedValues['VitalSign'][locale.languageCode];
@@ -581,6 +582,8 @@ class TranslationBase {
localizedValues['UpdateSuccessfully'][locale.languageCode];
String get emailSentSuccessfully =>
localizedValues['EmailSentSuccessfully'][locale.languageCode];
+ String get EmailSentError =>
+ localizedValues['EmailSentError'][locale.languageCode];
String get checkVaccineAvailability =>
localizedValues['CHECK_VACCINE_AVAILABILITY'][locale.languageCode];
String get myVaccinesAvailability =>
@@ -1172,6 +1175,7 @@ class TranslationBase {
String get infoInsurCards => localizedValues['info-insur-cards'][locale.languageCode];
String get scanNow => localizedValues['scan-now'][locale.languageCode];
String get pharmacyServiceTermsCondition => localizedValues['pharmacyServiceTermsCondition'][locale.languageCode];
+ String get recordDeleted => localizedValues['recordDeleted'][locale.languageCode];
String get referralStatus =>
localizedValues['referralStatus'][locale.languageCode];
@@ -1214,7 +1218,6 @@ class TranslationBase {
String get viewListChildren =>
localizedValues['view-list-children'][locale.languageCode];
String get addChild => localizedValues['add-child'][locale.languageCode];
- String get childName => localizedValues['child-name'][locale.languageCode];
String get childDob => localizedValues['childDob'][locale.languageCode];
String get deletedChildMes =>
localizedValues['deleted-child-mes'][locale.languageCode];
@@ -1263,6 +1266,16 @@ class TranslationBase {
String get measureTime => localizedValues['measure-time'][locale.languageCode];
String get update => localizedValues['update'][locale.languageCode];
+ String get covid19_driveThrueTest => localizedValues['covid19_driveThrueTest'][locale.languageCode];
+ String get eReferral => localizedValues['E-Referral'][locale.languageCode];
+ String get vaccination => localizedValues["vaccination"][locale.languageCode];
+ String get msg_email_address_up_to_date => localizedValues["msg_email_address_up_to_date"][locale.languageCode];
+ String get updateEmailMsg => localizedValues["update-email-msg"][locale.languageCode];
+ String get childName => localizedValues["childName"][locale.languageCode];
+ String get addNewChild => localizedValues["add-new-child"][locale.languageCode];
+ String get sendChildEmailMsg => localizedValues["send-child-email-msg"][locale.languageCode];
+ String get vaccinationAddChildMsg => localizedValues["vaccination-add-child-msg"][locale.languageCode];
+ String get childAddedSuccessfully => localizedValues["child_added_successfully"][locale.languageCode];
}
diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart
index 58ef9421..b2c52b2b 100644
--- a/lib/uitl/utils.dart
+++ b/lib/uitl/utils.dart
@@ -4,7 +4,9 @@ import 'dart:typed_data';
import 'package:badges/badges.dart';
import 'package:connectivity/connectivity.dart';
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/pages/Blood/my_balance_page.dart';
import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart';
import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart';
@@ -26,15 +28,19 @@ import 'package:diplomaticquarterapp/pages/medical/reports/report_home_page.dart
import 'package:diplomaticquarterapp/pages/medical/smart_watch_health_data/smart_watch_instructions.dart';
import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart';
import 'package:diplomaticquarterapp/pages/vaccine/my_vaccines_screen.dart';
+import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
+import 'package:diplomaticquarterapp/widgets/dialogs/alert_dialog.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
import '../Constants.dart';
import 'app_shared_preferences.dart';
import 'app_toast.dart';
+import 'gif_loader_dialog_utils.dart';
AppSharedPreferences sharedPref = new AppSharedPreferences();
@@ -488,13 +494,25 @@ class Utils {
),
));
}
- if (projectViewModel.havePrivilege(32)) {
+ if (projectViewModel.havePrivilege(32) || true) {
medical.add(InkWell(
- //TODO
-// onTap: () {
-// Navigator.push(
-// context, FadePage(page: DoctorHomePage()));
-// },
+ onTap: () {
+ userData().then((userData_){
+ if (projectViewModel.isLogin && userData_ != null) {
+ String patientID = userData_.patientID.toString();
+ GifLoaderDialogUtils.showMyDialog(context);
+ projectViewModel.platformBridge().connectHMGInternetWifi(patientID).then((value) => {GifLoaderDialogUtils.hideDialog(context)});
+ } else {
+ AlertDialogBox(
+ context: context,
+ confirmMessage: "Please login with your account first to use this feature",
+ okText: "OK",
+ okFunction: () {
+ AlertDialogBox.closeAlertDialog(context);
+ }).showAlertDialog(context);
+ }
+ });
+ },
child: MedicalProfileItem(
title: TranslationBase.of(context).internet,
imagePath: 'insurance_card_icon.png',
@@ -521,6 +539,11 @@ class Utils {
}
}
+Future userData() async {
+ var userData = AuthenticatedUser.fromJson(await AppSharedPreferences().getObject(MAIN_USER));
+ return userData;
+}
+
// extension function that use in iterations(list.. etc) to iterate items and get index and item it self
extension IndexedIterable on Iterable {
Iterable mapIndexed(T Function(E e, int i) f) {
diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart
index 461bfa7c..7d856113 100644
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@@ -523,6 +523,7 @@ class _AppDrawerState extends State {
this.user = null;
toDoProvider.setState(0, false);
Navigator.of(context).pushNamed(HOME);
+ // projectProvider.platformBridge().unRegisterHmgGeofences();
}
login() async {
diff --git a/pubspec.yaml b/pubspec.yaml
index 785e831d..24589cbb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -82,7 +82,8 @@ dependencies:
google_maps_flutter: ^1.0.3
-
+ flutter_polyline_points: ^0.1.0
+ location: ^2.3.5
# Qr code Scanner
barcode_scan_fix: ^1.0.2
@@ -183,6 +184,7 @@ flutter:
# assets:
assets:
- assets/images/
+ - assets/images/map_markers/
- assets/images/pharmacy/
- assets/images/medical/
- assets/images/new-design/