elimitate careportal
This commit is contained in:
Milos Kozak
parent
f727b25bb3
commit
05f73cd3ff
|
|
@ -25,7 +25,6 @@ import info.nightscout.androidaps.plugins.configBuilder.PluginStore
|
||||||
import info.nightscout.androidaps.interfaces.ProfileFunction
|
import info.nightscout.androidaps.interfaces.ProfileFunction
|
||||||
import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
|
import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
|
import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin
|
|
||||||
import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
|
import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
|
||||||
import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
|
import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
|
import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
|
||||||
|
|
@ -73,7 +72,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
|
||||||
@Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
|
@Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
|
||||||
@Inject lateinit var danaRv2Plugin: DanaRv2Plugin
|
@Inject lateinit var danaRv2Plugin: DanaRv2Plugin
|
||||||
@Inject lateinit var danaRSPlugin: DanaRSPlugin
|
@Inject lateinit var danaRSPlugin: DanaRSPlugin
|
||||||
@Inject lateinit var careportalPlugin: CareportalPlugin
|
|
||||||
@Inject lateinit var comboPlugin: ComboPlugin
|
@Inject lateinit var comboPlugin: ComboPlugin
|
||||||
@Inject lateinit var insulinOrefFreePeakPlugin: InsulinOrefFreePeakPlugin
|
@Inject lateinit var insulinOrefFreePeakPlugin: InsulinOrefFreePeakPlugin
|
||||||
@Inject lateinit var loopPlugin: LoopPlugin
|
@Inject lateinit var loopPlugin: LoopPlugin
|
||||||
|
|
@ -161,7 +159,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
|
||||||
addPreferencesFromResourceIfEnabled(tomatoPlugin, rootKey)
|
addPreferencesFromResourceIfEnabled(tomatoPlugin, rootKey)
|
||||||
addPreferencesFromResourceIfEnabled(poctechPlugin, rootKey)
|
addPreferencesFromResourceIfEnabled(poctechPlugin, rootKey)
|
||||||
addPreferencesFromResourceIfEnabled(glimpPlugin, rootKey)
|
addPreferencesFromResourceIfEnabled(glimpPlugin, rootKey)
|
||||||
addPreferencesFromResourceIfEnabled(careportalPlugin, rootKey)
|
|
||||||
addPreferencesFromResourceIfEnabled(loopPlugin, rootKey, config.APS)
|
addPreferencesFromResourceIfEnabled(loopPlugin, rootKey, config.APS)
|
||||||
addPreferencesFromResourceIfEnabled(openAPSAMAPlugin, rootKey, config.APS)
|
addPreferencesFromResourceIfEnabled(openAPSAMAPlugin, rootKey, config.APS)
|
||||||
addPreferencesFromResourceIfEnabled(openAPSSMBPlugin, rootKey, config.APS)
|
addPreferencesFromResourceIfEnabled(openAPSSMBPlugin, rootKey, config.APS)
|
||||||
|
|
|
||||||
|
|
@ -43,14 +43,12 @@ open class AppModule {
|
||||||
@PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
|
@PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
|
||||||
@PluginsModule.PumpDriver pumpDrivers: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
|
@PluginsModule.PumpDriver pumpDrivers: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
|
||||||
@PluginsModule.NotNSClient notNsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
|
@PluginsModule.NotNSClient notNsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
|
||||||
@PluginsModule.NSClient nsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
|
|
||||||
@PluginsModule.APS aps: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>)
|
@PluginsModule.APS aps: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>)
|
||||||
: List<@JvmSuppressWildcards PluginBase> {
|
: List<@JvmSuppressWildcards PluginBase> {
|
||||||
val plugins = allConfigs.toMutableMap()
|
val plugins = allConfigs.toMutableMap()
|
||||||
if (configInterface.PUMPDRIVERS) plugins += pumpDrivers.get()
|
if (configInterface.PUMPDRIVERS) plugins += pumpDrivers.get()
|
||||||
if (configInterface.APS) plugins += aps.get()
|
if (configInterface.APS) plugins += aps.get()
|
||||||
if (!configInterface.NSCLIENT) plugins += notNsClient.get()
|
if (!configInterface.NSCLIENT) plugins += notNsClient.get()
|
||||||
if (configInterface.NSCLIENT) plugins += nsClient.get()
|
|
||||||
return plugins.toList().sortedBy { it.first }.map { it.second }
|
return plugins.toList().sortedBy { it.first }.map { it.second }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@ import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTrigg
|
||||||
import info.nightscout.androidaps.plugins.general.automation.dialogs.EditActionDialog
|
import info.nightscout.androidaps.plugins.general.automation.dialogs.EditActionDialog
|
||||||
import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
|
import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
|
||||||
import info.nightscout.androidaps.plugins.general.automation.dialogs.EditTriggerDialog
|
import info.nightscout.androidaps.plugins.general.automation.dialogs.EditTriggerDialog
|
||||||
import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment
|
|
||||||
import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog
|
|
||||||
import info.nightscout.androidaps.plugins.general.food.FoodFragment
|
import info.nightscout.androidaps.plugins.general.food.FoodFragment
|
||||||
import info.nightscout.androidaps.plugins.general.maintenance.MaintenanceFragment
|
import info.nightscout.androidaps.plugins.general.maintenance.MaintenanceFragment
|
||||||
import info.nightscout.androidaps.plugins.general.nsclient.NSClientFragment
|
import info.nightscout.androidaps.plugins.general.nsclient.NSClientFragment
|
||||||
|
|
@ -55,13 +53,12 @@ abstract class FragmentsModule {
|
||||||
@ContributesAndroidInjector abstract fun contributesActionsFragment(): ActionsFragment
|
@ContributesAndroidInjector abstract fun contributesActionsFragment(): ActionsFragment
|
||||||
@ContributesAndroidInjector abstract fun contributesAutomationFragment(): AutomationFragment
|
@ContributesAndroidInjector abstract fun contributesAutomationFragment(): AutomationFragment
|
||||||
@ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
|
@ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
|
||||||
@ContributesAndroidInjector abstract fun contributesCareportalFragment(): CareportalFragment
|
|
||||||
@ContributesAndroidInjector abstract fun contributesComboFragment(): ComboFragment
|
@ContributesAndroidInjector abstract fun contributesComboFragment(): ComboFragment
|
||||||
|
|
||||||
@ContributesAndroidInjector
|
@ContributesAndroidInjector
|
||||||
abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
|
abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
|
||||||
|
|
||||||
@ContributesAndroidInjector abstract fun contributesDanaRFragment(): info.nightscout.androidaps.dana.DanaRFragment
|
@ContributesAndroidInjector abstract fun contributesDanaRFragment(): DanaRFragment
|
||||||
@ContributesAndroidInjector abstract fun contributesFoodFragment(): FoodFragment
|
@ContributesAndroidInjector abstract fun contributesFoodFragment(): FoodFragment
|
||||||
@ContributesAndroidInjector abstract fun contributesInsulinFragment(): InsulinFragment
|
@ContributesAndroidInjector abstract fun contributesInsulinFragment(): InsulinFragment
|
||||||
@ContributesAndroidInjector abstract fun contributesLocalProfileFragment(): LocalProfileFragment
|
@ContributesAndroidInjector abstract fun contributesLocalProfileFragment(): LocalProfileFragment
|
||||||
|
|
@ -108,7 +105,6 @@ abstract class FragmentsModule {
|
||||||
@ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
|
@ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
|
||||||
@ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
|
@ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
|
||||||
@ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
|
@ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
|
||||||
@ContributesAndroidInjector abstract fun contributesNewNSTreatmentDialog(): NewNSTreatmentDialog
|
|
||||||
@ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
|
@ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
|
||||||
@ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
|
@ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
|
||||||
@ContributesAndroidInjector abstract fun contributesProfileSwitchDialog(): ProfileSwitchDialog
|
@ContributesAndroidInjector abstract fun contributesProfileSwitchDialog(): ProfileSwitchDialog
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import dagger.Binds
|
||||||
import dagger.Module
|
import dagger.Module
|
||||||
import dagger.multibindings.IntKey
|
import dagger.multibindings.IntKey
|
||||||
import dagger.multibindings.IntoMap
|
import dagger.multibindings.IntoMap
|
||||||
|
import info.nightscout.androidaps.danars.DanaRSPlugin
|
||||||
import info.nightscout.androidaps.interfaces.PluginBase
|
import info.nightscout.androidaps.interfaces.PluginBase
|
||||||
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
|
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
|
||||||
import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
|
import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
|
||||||
|
|
@ -17,7 +18,6 @@ import info.nightscout.androidaps.plugins.constraints.storage.StorageConstraintP
|
||||||
import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerPlugin
|
import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
|
import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
|
import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin
|
|
||||||
import info.nightscout.androidaps.plugins.general.dataBroadcaster.DataBroadcastPlugin
|
import info.nightscout.androidaps.plugins.general.dataBroadcaster.DataBroadcastPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.food.FoodPlugin
|
import info.nightscout.androidaps.plugins.general.food.FoodPlugin
|
||||||
import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
|
import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
|
||||||
|
|
@ -34,10 +34,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorP
|
||||||
import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
|
import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
|
||||||
import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
|
import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
|
||||||
import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
|
import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
|
||||||
import info.nightscout.androidaps.danar.DanaRPlugin
|
|
||||||
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
|
|
||||||
import info.nightscout.androidaps.danars.DanaRSPlugin
|
|
||||||
import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
|
|
||||||
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
|
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
|
||||||
import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
|
import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
|
||||||
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
|
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
|
||||||
|
|
@ -160,12 +156,6 @@ abstract class PluginsModule {
|
||||||
@IntKey(170)
|
@IntKey(170)
|
||||||
abstract fun bindVirtualPumpPlugin(plugin: VirtualPumpPlugin): PluginBase
|
abstract fun bindVirtualPumpPlugin(plugin: VirtualPumpPlugin): PluginBase
|
||||||
|
|
||||||
@Binds
|
|
||||||
@NSClient
|
|
||||||
@IntoMap
|
|
||||||
@IntKey(180)
|
|
||||||
abstract fun bindCareportalPlugin(plugin: CareportalPlugin): PluginBase
|
|
||||||
|
|
||||||
@Binds
|
@Binds
|
||||||
@APS
|
@APS
|
||||||
@IntoMap
|
@IntoMap
|
||||||
|
|
@ -226,7 +216,6 @@ abstract class PluginsModule {
|
||||||
@IntKey(280)
|
@IntKey(280)
|
||||||
abstract fun bindSmsCommunicatorPlugin(plugin: SmsCommunicatorPlugin): PluginBase
|
abstract fun bindSmsCommunicatorPlugin(plugin: SmsCommunicatorPlugin): PluginBase
|
||||||
|
|
||||||
|
|
||||||
@Binds
|
@Binds
|
||||||
@APS
|
@APS
|
||||||
@IntoMap
|
@IntoMap
|
||||||
|
|
@ -356,9 +345,6 @@ abstract class PluginsModule {
|
||||||
@Qualifier
|
@Qualifier
|
||||||
annotation class NotNSClient
|
annotation class NotNSClient
|
||||||
|
|
||||||
@Qualifier
|
|
||||||
annotation class NSClient
|
|
||||||
|
|
||||||
@Qualifier
|
@Qualifier
|
||||||
annotation class APS
|
annotation class APS
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
|
||||||
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
|
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
|
||||||
import info.nightscout.androidaps.utils.DateUtil
|
import info.nightscout.androidaps.utils.DateUtil
|
||||||
import info.nightscout.androidaps.utils.HtmlHelper
|
import info.nightscout.androidaps.utils.HtmlHelper
|
||||||
import info.nightscout.androidaps.utils.alertDialogs.OKDialog
|
|
||||||
import info.nightscout.androidaps.utils.Translator
|
import info.nightscout.androidaps.utils.Translator
|
||||||
|
import info.nightscout.androidaps.utils.alertDialogs.OKDialog
|
||||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||||
import kotlinx.android.synthetic.main.dialog_care.*
|
import kotlinx.android.synthetic.main.dialog_care.*
|
||||||
import kotlinx.android.synthetic.main.notes.*
|
import kotlinx.android.synthetic.main.notes.*
|
||||||
|
|
@ -44,10 +44,13 @@ class CareDialog : DialogFragmentWithDate() {
|
||||||
SENSOR_INSERT,
|
SENSOR_INSERT,
|
||||||
BATTERY_CHANGE,
|
BATTERY_CHANGE,
|
||||||
NOTE,
|
NOTE,
|
||||||
EXERCISE
|
EXERCISE,
|
||||||
|
QUESTION,
|
||||||
|
ANNOUNCEMENT
|
||||||
}
|
}
|
||||||
|
|
||||||
private var options: EventType = EventType.BGCHECK
|
private var options: EventType = EventType.BGCHECK
|
||||||
|
|
||||||
@StringRes
|
@StringRes
|
||||||
private var event: Int = R.string.none
|
private var event: Int = R.string.none
|
||||||
|
|
||||||
|
|
@ -85,6 +88,8 @@ class CareDialog : DialogFragmentWithDate() {
|
||||||
EventType.BATTERY_CHANGE -> R.drawable.icon_cp_pump_battery
|
EventType.BATTERY_CHANGE -> R.drawable.icon_cp_pump_battery
|
||||||
EventType.NOTE -> R.drawable.icon_cp_note
|
EventType.NOTE -> R.drawable.icon_cp_note
|
||||||
EventType.EXERCISE -> R.drawable.icon_cp_exercise
|
EventType.EXERCISE -> R.drawable.icon_cp_exercise
|
||||||
|
EventType.QUESTION -> R.drawable.icon_cp_question
|
||||||
|
EventType.ANNOUNCEMENT -> R.drawable.icon_cp_announcement
|
||||||
})
|
})
|
||||||
actions_care_title.text = resourceHelper.gs(when (options) {
|
actions_care_title.text = resourceHelper.gs(when (options) {
|
||||||
EventType.BGCHECK -> R.string.careportal_bgcheck
|
EventType.BGCHECK -> R.string.careportal_bgcheck
|
||||||
|
|
@ -92,9 +97,13 @@ class CareDialog : DialogFragmentWithDate() {
|
||||||
EventType.BATTERY_CHANGE -> R.string.careportal_pumpbatterychange
|
EventType.BATTERY_CHANGE -> R.string.careportal_pumpbatterychange
|
||||||
EventType.NOTE -> R.string.careportal_note
|
EventType.NOTE -> R.string.careportal_note
|
||||||
EventType.EXERCISE -> R.string.careportal_exercise
|
EventType.EXERCISE -> R.string.careportal_exercise
|
||||||
|
EventType.QUESTION -> R.string.careportal_question
|
||||||
|
EventType.ANNOUNCEMENT -> R.string.careportal_announcement
|
||||||
})
|
})
|
||||||
|
|
||||||
when (options) {
|
when (options) {
|
||||||
|
EventType.QUESTION,
|
||||||
|
EventType.ANNOUNCEMENT,
|
||||||
EventType.BGCHECK -> {
|
EventType.BGCHECK -> {
|
||||||
action_care_duration_layout.visibility = View.GONE
|
action_care_duration_layout.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
|
@ -134,7 +143,7 @@ class CareDialog : DialogFragmentWithDate() {
|
||||||
}
|
}
|
||||||
actions_care_duration.setParams(savedInstanceState?.getDouble("actions_care_duration")
|
actions_care_duration.setParams(savedInstanceState?.getDouble("actions_care_duration")
|
||||||
?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, ok)
|
?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, ok)
|
||||||
if (options == EventType.NOTE)
|
if (options == EventType.NOTE || options == EventType.QUESTION || options == EventType.ANNOUNCEMENT)
|
||||||
notes_layout?.visibility = View.VISIBLE // independent to preferences
|
notes_layout?.visibility = View.VISIBLE // independent to preferences
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -144,7 +153,7 @@ class CareDialog : DialogFragmentWithDate() {
|
||||||
|
|
||||||
val json = JSONObject()
|
val json = JSONObject()
|
||||||
val actions: LinkedList<String> = LinkedList()
|
val actions: LinkedList<String> = LinkedList()
|
||||||
if (options == EventType.BGCHECK) {
|
if (options == EventType.BGCHECK || options == EventType.QUESTION || options == EventType.ANNOUNCEMENT) {
|
||||||
val type =
|
val type =
|
||||||
when {
|
when {
|
||||||
actions_care_meter.isChecked -> "Finger"
|
actions_care_meter.isChecked -> "Finger"
|
||||||
|
|
@ -178,6 +187,8 @@ class CareDialog : DialogFragmentWithDate() {
|
||||||
EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
|
EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
|
||||||
EventType.NOTE -> CareportalEvent.NOTE
|
EventType.NOTE -> CareportalEvent.NOTE
|
||||||
EventType.EXERCISE -> CareportalEvent.EXERCISE
|
EventType.EXERCISE -> CareportalEvent.EXERCISE
|
||||||
|
EventType.QUESTION -> CareportalEvent.QUESTION
|
||||||
|
EventType.ANNOUNCEMENT -> CareportalEvent.ANNOUNCEMENT
|
||||||
})
|
})
|
||||||
json.put("units", profileFunction.getUnits())
|
json.put("units", profileFunction.getUnits())
|
||||||
if (enteredBy.isNotEmpty())
|
if (enteredBy.isNotEmpty())
|
||||||
|
|
@ -194,6 +205,8 @@ class CareDialog : DialogFragmentWithDate() {
|
||||||
EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
|
EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
|
||||||
EventType.NOTE -> CareportalEvent.NOTE
|
EventType.NOTE -> CareportalEvent.NOTE
|
||||||
EventType.EXERCISE -> CareportalEvent.EXERCISE
|
EventType.EXERCISE -> CareportalEvent.EXERCISE
|
||||||
|
EventType.QUESTION -> CareportalEvent.QUESTION
|
||||||
|
EventType.ANNOUNCEMENT -> CareportalEvent.ANNOUNCEMENT
|
||||||
}
|
}
|
||||||
careportalEvent.json = json.toString()
|
careportalEvent.json = json.toString()
|
||||||
aapsLogger.debug("USER ENTRY: CAREPORTAL ${careportalEvent.eventType} json: ${careportalEvent.json}")
|
aapsLogger.debug("USER ENTRY: CAREPORTAL ${careportalEvent.eventType} json: ${careportalEvent.json}")
|
||||||
|
|
|
||||||
|
|
@ -144,6 +144,12 @@ class ActionsFragment : DaggerFragment() {
|
||||||
actions_exercise.setOnClickListener {
|
actions_exercise.setOnClickListener {
|
||||||
CareDialog().setOptions(CareDialog.EventType.EXERCISE, R.string.careportal_exercise).show(childFragmentManager, "Actions")
|
CareDialog().setOptions(CareDialog.EventType.EXERCISE, R.string.careportal_exercise).show(childFragmentManager, "Actions")
|
||||||
}
|
}
|
||||||
|
actions_question.setOnClickListener {
|
||||||
|
CareDialog().setOptions(CareDialog.EventType.QUESTION, R.string.careportal_question).show(childFragmentManager, "Actions")
|
||||||
|
}
|
||||||
|
actions_announcement.setOnClickListener {
|
||||||
|
CareDialog().setOptions(CareDialog.EventType.ANNOUNCEMENT, R.string.careportal_announcement).show(childFragmentManager, "Actions")
|
||||||
|
}
|
||||||
|
|
||||||
sp.putBoolean(R.string.key_objectiveuseactions, true)
|
sp.putBoolean(R.string.key_objectiveuseactions, true)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,134 +0,0 @@
|
||||||
package info.nightscout.androidaps.plugins.general.careportal
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import dagger.android.support.DaggerFragment
|
|
||||||
import info.nightscout.androidaps.R
|
|
||||||
import info.nightscout.androidaps.events.EventCareportalEventChange
|
|
||||||
import info.nightscout.androidaps.interfaces.ActivePluginProvider
|
|
||||||
import info.nightscout.androidaps.plugins.bus.RxBusWrapper
|
|
||||||
import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog
|
|
||||||
import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
|
|
||||||
import info.nightscout.androidaps.utils.FabricPrivacy
|
|
||||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
|
||||||
import io.reactivex.disposables.CompositeDisposable
|
|
||||||
import kotlinx.android.synthetic.main.careportal_fragment.*
|
|
||||||
import kotlinx.android.synthetic.main.careportal_stats_fragment.*
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
class CareportalFragment : DaggerFragment(), View.OnClickListener {
|
|
||||||
@Inject lateinit var resourceHelper: ResourceHelper
|
|
||||||
@Inject lateinit var rxBus: RxBusWrapper
|
|
||||||
@Inject lateinit var statusLightHandler: StatusLightHandler
|
|
||||||
@Inject lateinit var fabricPrivacy: FabricPrivacy
|
|
||||||
@Inject lateinit var activePlugin: ActivePluginProvider
|
|
||||||
|
|
||||||
private val disposable = CompositeDisposable()
|
|
||||||
|
|
||||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
|
||||||
return inflater.inflate(R.layout.careportal_fragment, container, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
|
||||||
super.onViewCreated(view, savedInstanceState)
|
|
||||||
careportal_bgcheck.setOnClickListener(this)
|
|
||||||
careportal_announcement.setOnClickListener(this)
|
|
||||||
careportal_cgmsensorinsert.setOnClickListener(this)
|
|
||||||
careportal_cgmsensorstart.setOnClickListener(this)
|
|
||||||
careportal_combobolus.setOnClickListener(this)
|
|
||||||
careportal_correctionbolus.setOnClickListener(this)
|
|
||||||
careportal_carbscorrection.setOnClickListener(this)
|
|
||||||
careportal_exercise.setOnClickListener(this)
|
|
||||||
careportal_insulincartridgechange.setOnClickListener(this)
|
|
||||||
careportal_pumpbatterychange.setOnClickListener(this)
|
|
||||||
careportal_mealbolus.setOnClickListener(this)
|
|
||||||
careportal_note.setOnClickListener(this)
|
|
||||||
careportal_profileswitch.setOnClickListener(this)
|
|
||||||
careportal_pumpsitechange.setOnClickListener(this)
|
|
||||||
careportal_question.setOnClickListener(this)
|
|
||||||
careportal_snackbolus.setOnClickListener(this)
|
|
||||||
careportal_tempbasalend.setOnClickListener(this)
|
|
||||||
careportal_tempbasalstart.setOnClickListener(this)
|
|
||||||
careportal_openapsoffline.setOnClickListener(this)
|
|
||||||
careportal_temporarytarget.setOnClickListener(this)
|
|
||||||
|
|
||||||
val profileStore = activePlugin.activeProfileInterface.profile
|
|
||||||
if (profileStore == null) {
|
|
||||||
profileview_noprofile.visibility = View.VISIBLE
|
|
||||||
careportal_buttons.visibility = View.GONE
|
|
||||||
} else {
|
|
||||||
profileview_noprofile.visibility = View.GONE
|
|
||||||
careportal_buttons.visibility = View.VISIBLE
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized override fun onResume() {
|
|
||||||
super.onResume()
|
|
||||||
disposable.add(rxBus
|
|
||||||
.toObservable(EventCareportalEventChange::class.java)
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe({ updateGUI() }) { fabricPrivacy.logException(it) }
|
|
||||||
)
|
|
||||||
updateGUI()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized override fun onPause() {
|
|
||||||
super.onPause()
|
|
||||||
disposable.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onClick(view: View) {
|
|
||||||
val BGCHECK = OptionsToShow(R.id.careportal_bgcheck, R.string.careportal_bgcheck).date().bg()
|
|
||||||
val SNACKBOLUS = OptionsToShow(R.id.careportal_snackbolus, R.string.careportal_snackbolus).date().bg().insulin().carbs().prebolus()
|
|
||||||
val MEALBOLUS = OptionsToShow(R.id.careportal_mealbolus, R.string.careportal_mealbolus).date().bg().insulin().carbs().prebolus()
|
|
||||||
val CORRECTIONBOLUS = OptionsToShow(R.id.careportal_correctionbolus, R.string.careportal_correctionbolus).date().bg().insulin().carbs().prebolus()
|
|
||||||
val CARBCORRECTION = OptionsToShow(R.id.careportal_carbscorrection, R.string.careportal_carbscorrection).date().bg().carbs()
|
|
||||||
val COMBOBOLUS = OptionsToShow(R.id.careportal_combobolus, R.string.careportal_combobolus).date().bg().insulin().carbs().prebolus().duration().split()
|
|
||||||
val ANNOUNCEMENT = OptionsToShow(R.id.careportal_announcement, R.string.careportal_announcement).date().bg()
|
|
||||||
val NOTE = OptionsToShow(R.id.careportal_note, R.string.careportal_note).date().bg().duration()
|
|
||||||
val QUESTION = OptionsToShow(R.id.careportal_question, R.string.careportal_question).date().bg()
|
|
||||||
val EXERCISE = OptionsToShow(R.id.careportal_exercise, R.string.careportal_exercise).date().duration()
|
|
||||||
val SITECHANGE = OptionsToShow(R.id.careportal_pumpsitechange, R.string.careportal_pumpsitechange).date().bg()
|
|
||||||
val SENSORSTART = OptionsToShow(R.id.careportal_cgmsensorstart, R.string.careportal_cgmsensorstart).date().bg()
|
|
||||||
val SENSORCHANGE = OptionsToShow(R.id.careportal_cgmsensorinsert, R.string.careportal_cgmsensorinsert).date().bg()
|
|
||||||
val INSULINCHANGE = OptionsToShow(R.id.careportal_insulincartridgechange, R.string.careportal_insulincartridgechange).date().bg()
|
|
||||||
val PUMPBATTERYCHANGE = OptionsToShow(R.id.careportal_pumpbatterychange, R.string.careportal_pumpbatterychange).date().bg()
|
|
||||||
val TEMPBASALSTART = OptionsToShow(R.id.careportal_tempbasalstart, R.string.careportal_tempbasalstart).date().bg().duration().percent().absolute()
|
|
||||||
val TEMPBASALEND = OptionsToShow(R.id.careportal_tempbasalend, R.string.careportal_tempbasalend).date().bg()
|
|
||||||
val PROFILESWITCH = OptionsToShow(R.id.careportal_profileswitch, R.string.careportal_profileswitch).date().duration().profile()
|
|
||||||
val OPENAPSOFFLINE = OptionsToShow(R.id.careportal_openapsoffline, R.string.careportal_openapsoffline).date().duration()
|
|
||||||
val TEMPTARGET = OptionsToShow(R.id.careportal_temporarytarget, R.string.careportal_temporarytarget).date().duration().tempTarget()
|
|
||||||
|
|
||||||
val newDialog = NewNSTreatmentDialog()
|
|
||||||
when (view.id) {
|
|
||||||
R.id.careportal_bgcheck -> newDialog.setOptions(BGCHECK, R.string.careportal_bgcheck)
|
|
||||||
R.id.careportal_announcement -> newDialog.setOptions(ANNOUNCEMENT, R.string.careportal_announcement)
|
|
||||||
R.id.careportal_cgmsensorinsert -> newDialog.setOptions(SENSORCHANGE, R.string.careportal_cgmsensorinsert)
|
|
||||||
R.id.careportal_cgmsensorstart -> newDialog.setOptions(SENSORSTART, R.string.careportal_cgmsensorstart)
|
|
||||||
R.id.careportal_combobolus -> newDialog.setOptions(COMBOBOLUS, R.string.careportal_combobolus)
|
|
||||||
R.id.careportal_correctionbolus -> newDialog.setOptions(CORRECTIONBOLUS, R.string.careportal_correctionbolus)
|
|
||||||
R.id.careportal_carbscorrection -> newDialog.setOptions(CARBCORRECTION, R.string.careportal_carbscorrection)
|
|
||||||
R.id.careportal_exercise -> newDialog.setOptions(EXERCISE, R.string.careportal_exercise)
|
|
||||||
R.id.careportal_insulincartridgechange -> newDialog.setOptions(INSULINCHANGE, R.string.careportal_insulincartridgechange)
|
|
||||||
R.id.careportal_pumpbatterychange -> newDialog.setOptions(PUMPBATTERYCHANGE, R.string.careportal_pumpbatterychange)
|
|
||||||
R.id.careportal_mealbolus -> newDialog.setOptions(MEALBOLUS, R.string.careportal_mealbolus)
|
|
||||||
R.id.careportal_note -> newDialog.setOptions(NOTE, R.string.careportal_note)
|
|
||||||
R.id.careportal_profileswitch -> newDialog.setOptions(PROFILESWITCH, R.string.careportal_profileswitch)
|
|
||||||
R.id.careportal_pumpsitechange -> newDialog.setOptions(SITECHANGE, R.string.careportal_pumpsitechange)
|
|
||||||
R.id.careportal_question -> newDialog.setOptions(QUESTION, R.string.careportal_question)
|
|
||||||
R.id.careportal_snackbolus -> newDialog.setOptions(SNACKBOLUS, R.string.careportal_snackbolus)
|
|
||||||
R.id.careportal_tempbasalstart -> newDialog.setOptions(TEMPBASALSTART, R.string.careportal_tempbasalstart)
|
|
||||||
R.id.careportal_tempbasalend -> newDialog.setOptions(TEMPBASALEND, R.string.careportal_tempbasalend)
|
|
||||||
R.id.careportal_openapsoffline -> newDialog.setOptions(OPENAPSOFFLINE, R.string.careportal_openapsoffline)
|
|
||||||
R.id.careportal_temporarytarget -> newDialog.setOptions(TEMPTARGET, R.string.careportal_temporarytarget)
|
|
||||||
}
|
|
||||||
NewNSTreatmentDialog().show(childFragmentManager, "CareportalFragment")
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun updateGUI() {
|
|
||||||
statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, null, careportal_sensorage, careportal_pbage, null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
package info.nightscout.androidaps.plugins.general.careportal
|
|
||||||
|
|
||||||
import dagger.android.HasAndroidInjector
|
|
||||||
import info.nightscout.androidaps.Config
|
|
||||||
import info.nightscout.androidaps.R
|
|
||||||
import info.nightscout.androidaps.interfaces.PluginBase
|
|
||||||
import info.nightscout.androidaps.interfaces.PluginDescription
|
|
||||||
import info.nightscout.androidaps.interfaces.PluginType
|
|
||||||
import info.nightscout.androidaps.logging.AAPSLogger
|
|
||||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
|
||||||
import javax.inject.Inject
|
|
||||||
import javax.inject.Singleton
|
|
||||||
|
|
||||||
@Singleton
|
|
||||||
class CareportalPlugin @Inject constructor(
|
|
||||||
injector: HasAndroidInjector,
|
|
||||||
aapsLogger: AAPSLogger,
|
|
||||||
resourceHelper: ResourceHelper,
|
|
||||||
config: Config
|
|
||||||
) : PluginBase(PluginDescription()
|
|
||||||
.mainType(PluginType.GENERAL)
|
|
||||||
.fragmentClass(CareportalFragment::class.java.name)
|
|
||||||
.pluginName(R.string.careportal)
|
|
||||||
.shortName(R.string.careportal_shortname)
|
|
||||||
.visibleByDefault(config.NSCLIENT)
|
|
||||||
.enableByDefault(config.NSCLIENT)
|
|
||||||
.description(R.string.description_careportal),
|
|
||||||
aapsLogger, resourceHelper, injector
|
|
||||||
)
|
|
||||||
|
|
@ -1,740 +0,0 @@
|
||||||
package info.nightscout.androidaps.plugins.general.careportal.Dialogs;
|
|
||||||
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.text.Editable;
|
|
||||||
import android.text.TextWatcher;
|
|
||||||
import android.text.format.DateFormat;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.view.Window;
|
|
||||||
import android.view.WindowManager;
|
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.ArrayAdapter;
|
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.LinearLayout;
|
|
||||||
import android.widget.RadioButton;
|
|
||||||
import android.widget.Spinner;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.annotation.StringRes;
|
|
||||||
import androidx.fragment.app.DialogFragment;
|
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
|
|
||||||
import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
|
|
||||||
|
|
||||||
import org.json.JSONException;
|
|
||||||
import org.json.JSONObject;
|
|
||||||
|
|
||||||
import java.text.DecimalFormat;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import dagger.android.HasAndroidInjector;
|
|
||||||
import dagger.android.support.DaggerDialogFragment;
|
|
||||||
import info.nightscout.androidaps.Constants;
|
|
||||||
import info.nightscout.androidaps.MainApp;
|
|
||||||
import info.nightscout.androidaps.R;
|
|
||||||
import info.nightscout.androidaps.data.Profile;
|
|
||||||
import info.nightscout.androidaps.db.BgReading;
|
|
||||||
import info.nightscout.androidaps.db.CareportalEvent;
|
|
||||||
import info.nightscout.androidaps.db.ProfileSwitch;
|
|
||||||
import info.nightscout.androidaps.interfaces.ActivePluginProvider;
|
|
||||||
import info.nightscout.androidaps.interfaces.ProfileFunction;
|
|
||||||
import info.nightscout.androidaps.interfaces.ProfileStore;
|
|
||||||
import info.nightscout.androidaps.logging.AAPSLogger;
|
|
||||||
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
|
|
||||||
import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
|
|
||||||
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
|
|
||||||
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
|
|
||||||
import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
|
|
||||||
import info.nightscout.androidaps.utils.DateUtil;
|
|
||||||
import info.nightscout.androidaps.utils.DefaultValueHelper;
|
|
||||||
import info.nightscout.androidaps.utils.HardLimits;
|
|
||||||
import info.nightscout.androidaps.utils.JsonHelper;
|
|
||||||
import info.nightscout.androidaps.utils.NumberPicker;
|
|
||||||
import info.nightscout.androidaps.utils.SafeParse;
|
|
||||||
import info.nightscout.androidaps.utils.Translator;
|
|
||||||
import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
|
|
||||||
import info.nightscout.androidaps.utils.resources.ResourceHelper;
|
|
||||||
import info.nightscout.androidaps.utils.sharedPreferences.SP;
|
|
||||||
|
|
||||||
public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.OnClickListener, DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener {
|
|
||||||
@Inject HasAndroidInjector injector;
|
|
||||||
@Inject AAPSLogger aapsLogger;
|
|
||||||
@Inject DefaultValueHelper defaultValueHelper;
|
|
||||||
@Inject ProfileFunction profileFunction;
|
|
||||||
@Inject ResourceHelper resourceHelper;
|
|
||||||
@Inject ConstraintChecker constraintChecker;
|
|
||||||
@Inject SP sp;
|
|
||||||
@Inject ActivePluginProvider activePlugin;
|
|
||||||
@Inject TreatmentsPlugin treatmentsPlugin;
|
|
||||||
@Inject HardLimits hardLimits;
|
|
||||||
@Inject NSUpload nsUpload;
|
|
||||||
@Inject Translator translator;
|
|
||||||
@Inject DateUtil dateUtil;
|
|
||||||
|
|
||||||
private static OptionsToShow options;
|
|
||||||
private static @StringRes int event;
|
|
||||||
|
|
||||||
private Profile profile;
|
|
||||||
public ProfileStore profileStore;
|
|
||||||
|
|
||||||
TextView eventTypeText;
|
|
||||||
LinearLayout layoutPercent;
|
|
||||||
LinearLayout layoutAbsolute;
|
|
||||||
LinearLayout layoutReuse;
|
|
||||||
|
|
||||||
|
|
||||||
TextView dateButton;
|
|
||||||
TextView timeButton;
|
|
||||||
|
|
||||||
TextView bgUnitsView;
|
|
||||||
RadioButton meterRadioButton;
|
|
||||||
RadioButton sensorRadioButton;
|
|
||||||
RadioButton otherRadioButton;
|
|
||||||
EditText notesEdit;
|
|
||||||
Spinner profileSpinner;
|
|
||||||
Spinner reasonSpinner;
|
|
||||||
Button reuseButton;
|
|
||||||
|
|
||||||
NumberPicker editBg;
|
|
||||||
NumberPicker editCarbs;
|
|
||||||
NumberPicker editInsulin;
|
|
||||||
NumberPicker editSplit;
|
|
||||||
NumberPicker editDuration;
|
|
||||||
NumberPicker editPercent;
|
|
||||||
NumberPicker editAbsolute;
|
|
||||||
NumberPicker editCarbTime;
|
|
||||||
NumberPicker editTemptarget;
|
|
||||||
NumberPicker editPercentage;
|
|
||||||
NumberPicker editTimeshift;
|
|
||||||
|
|
||||||
Date eventTime;
|
|
||||||
|
|
||||||
private static Integer seconds = null;
|
|
||||||
|
|
||||||
public NewNSTreatmentDialog setOptions(OptionsToShow options, int event) {
|
|
||||||
this.options = options;
|
|
||||||
this.event = event;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public NewNSTreatmentDialog() {
|
|
||||||
super();
|
|
||||||
|
|
||||||
if (seconds == null) {
|
|
||||||
seconds = Double.valueOf(Math.random() * 59).intValue();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
|
|
||||||
Bundle savedInstanceState) {
|
|
||||||
if (options == null) return null;
|
|
||||||
getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
|
|
||||||
getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
|
|
||||||
setCancelable(true);
|
|
||||||
getDialog().setCanceledOnTouchOutside(false);
|
|
||||||
setStyle(DialogFragment.STYLE_NORMAL, getTheme());
|
|
||||||
View view = inflater.inflate(R.layout.careportal_newnstreatment_dialog, container, false);
|
|
||||||
|
|
||||||
layoutPercent = view.findViewById(R.id.careportal_newnstreatment_percent_layout);
|
|
||||||
layoutAbsolute = view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
|
|
||||||
|
|
||||||
layoutReuse = view.findViewById(R.id.careportal_newnstreatment_reuse_layout);
|
|
||||||
|
|
||||||
eventTypeText = view.findViewById(R.id.careportal_newnstreatment_eventtype);
|
|
||||||
eventTypeText.setText(event);
|
|
||||||
bgUnitsView = view.findViewById(R.id.careportal_newnstreatment_bgunits);
|
|
||||||
meterRadioButton = view.findViewById(R.id.careportal_newnstreatment_meter);
|
|
||||||
sensorRadioButton = view.findViewById(R.id.careportal_newnstreatment_sensor);
|
|
||||||
otherRadioButton = view.findViewById(R.id.careportal_newnstreatment_other);
|
|
||||||
profileSpinner = view.findViewById(R.id.careportal_newnstreatment_profile);
|
|
||||||
|
|
||||||
reuseButton = view.findViewById(R.id.careportal_newnstreatment_reusebutton);
|
|
||||||
|
|
||||||
notesEdit = view.findViewById(R.id.careportal_newnstreatment_notes);
|
|
||||||
|
|
||||||
reasonSpinner = view.findViewById(R.id.careportal_newnstreatment_temptarget_reason);
|
|
||||||
|
|
||||||
eventTime = new Date();
|
|
||||||
dateButton = view.findViewById(R.id.careportal_newnstreatment_eventdate);
|
|
||||||
timeButton = view.findViewById(R.id.careportal_newnstreatment_eventtime);
|
|
||||||
dateButton.setText(DateUtil.dateString(eventTime));
|
|
||||||
timeButton.setText(dateUtil.timeString(eventTime));
|
|
||||||
dateButton.setOnClickListener(this);
|
|
||||||
timeButton.setOnClickListener(this);
|
|
||||||
|
|
||||||
view.findViewById(R.id.ok).setOnClickListener(this);
|
|
||||||
view.findViewById(R.id.cancel).setOnClickListener(this);
|
|
||||||
|
|
||||||
// profile
|
|
||||||
profile = profileFunction.getProfile();
|
|
||||||
profileStore = activePlugin.getActiveProfileInterface().getProfile();
|
|
||||||
if (profileStore == null) {
|
|
||||||
if (options.eventType == R.id.careportal_profileswitch) {
|
|
||||||
aapsLogger.error("Profile switch called but plugin doesn't contain valid profile");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ArrayList<CharSequence> profileList;
|
|
||||||
profileList = profileStore.getProfileList();
|
|
||||||
ArrayAdapter<CharSequence> adapter = new ArrayAdapter<>(getContext(),
|
|
||||||
R.layout.spinner_centered, profileList);
|
|
||||||
profileSpinner.setAdapter(adapter);
|
|
||||||
// set selected to actual profile
|
|
||||||
for (int p = 0; p < profileList.size(); p++) {
|
|
||||||
if (profileList.get(p).equals(profileFunction.getProfileName(false)))
|
|
||||||
profileSpinner.setSelection(p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
final Double bg = Profile.fromMgdlToUnits(new GlucoseStatus(injector).getGlucoseStatusData() != null ? new GlucoseStatus(injector).getGlucoseStatusData().glucose : 0d, profileFunction.getUnits());
|
|
||||||
|
|
||||||
// temp target
|
|
||||||
final List<String> reasonList = Lists.newArrayList(
|
|
||||||
resourceHelper.gs(R.string.manual),
|
|
||||||
resourceHelper.gs(R.string.eatingsoon),
|
|
||||||
resourceHelper.gs(R.string.activity),
|
|
||||||
resourceHelper.gs(R.string.hypo));
|
|
||||||
ArrayAdapter<String> adapterReason = new ArrayAdapter<>(getContext(),
|
|
||||||
R.layout.spinner_centered, reasonList);
|
|
||||||
reasonSpinner.setAdapter(adapterReason);
|
|
||||||
reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
|
|
||||||
@Override
|
|
||||||
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
|
|
||||||
double defaultDuration;
|
|
||||||
double defaultTarget;
|
|
||||||
if (profile != null && editTemptarget.getValue().equals(bg)) {
|
|
||||||
defaultTarget = bg;
|
|
||||||
} else {
|
|
||||||
//prevent changes on screen rotate
|
|
||||||
defaultTarget = editTemptarget.getValue();
|
|
||||||
}
|
|
||||||
boolean erase = false;
|
|
||||||
|
|
||||||
if (resourceHelper.gs(R.string.eatingsoon).equals(reasonList.get(position))) {
|
|
||||||
defaultDuration = defaultValueHelper.determineEatingSoonTTDuration();
|
|
||||||
defaultTarget = defaultValueHelper.determineEatingSoonTT();
|
|
||||||
} else if (resourceHelper.gs(R.string.activity).equals(reasonList.get(position))) {
|
|
||||||
defaultDuration = defaultValueHelper.determineActivityTTDuration();
|
|
||||||
defaultTarget = defaultValueHelper.determineActivityTT();
|
|
||||||
} else if (resourceHelper.gs(R.string.hypo).equals(reasonList.get(position))) {
|
|
||||||
defaultDuration = defaultValueHelper.determineHypoTTDuration();
|
|
||||||
defaultTarget = defaultValueHelper.determineHypoTT();
|
|
||||||
} else if (editDuration.getValue() != 0) {
|
|
||||||
defaultDuration = editDuration.getValue();
|
|
||||||
} else {
|
|
||||||
defaultDuration = 0;
|
|
||||||
erase = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (defaultTarget != 0 || erase) {
|
|
||||||
editTemptarget.setValue(defaultTarget);
|
|
||||||
}
|
|
||||||
if (defaultDuration != 0) {
|
|
||||||
editDuration.setValue(defaultDuration);
|
|
||||||
} else if (erase) {
|
|
||||||
editDuration.setValue(0d);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onNothingSelected(AdapterView<?> parent) {
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// bg
|
|
||||||
bgUnitsView.setText(profileFunction.getUnits());
|
|
||||||
|
|
||||||
TextWatcher bgTextWatcher = new TextWatcher() {
|
|
||||||
|
|
||||||
public void afterTextChanged(Editable s) {
|
|
||||||
}
|
|
||||||
|
|
||||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onTextChanged(CharSequence s, int start, int before, int count) {
|
|
||||||
if (sensorRadioButton.isChecked()) meterRadioButton.setChecked(true);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
editBg = view.findViewById(R.id.careportal_newnstreatment_bginput);
|
|
||||||
editTemptarget = view.findViewById(R.id.careportal_newnstreatment_temptarget);
|
|
||||||
if (profile == null) {
|
|
||||||
editBg.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), bgTextWatcher);
|
|
||||||
editTemptarget.setParams(Constants.MIN_TT_MGDL, Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
|
|
||||||
} else if (profileFunction.getUnits().equals(Constants.MMOL)) {
|
|
||||||
editBg.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok), bgTextWatcher);
|
|
||||||
editTemptarget.setParams(Constants.MIN_TT_MMOL, Constants.MIN_TT_MMOL, Constants.MAX_TT_MMOL, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
|
|
||||||
} else {
|
|
||||||
editBg.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), bgTextWatcher);
|
|
||||||
editTemptarget.setParams(Constants.MIN_TT_MGDL, Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
|
|
||||||
}
|
|
||||||
|
|
||||||
sensorRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
|
|
||||||
double bg1 = Profile.fromMgdlToUnits(new GlucoseStatus(injector).getGlucoseStatusData() != null ? new GlucoseStatus(injector).getGlucoseStatusData().glucose : 0d, profileFunction.getUnits());
|
|
||||||
if (savedInstanceState != null && savedInstanceState.getDouble("editBg") != bg1) {
|
|
||||||
editBg.setValue(savedInstanceState.getDouble("editBg"));
|
|
||||||
} else {
|
|
||||||
editBg.setValue(bg1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Integer maxCarbs = constraintChecker.getMaxCarbsAllowed().value();
|
|
||||||
editCarbs = view.findViewById(R.id.careportal_newnstreatment_carbsinput);
|
|
||||||
editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
|
|
||||||
|
|
||||||
Double maxInsulin = constraintChecker.getMaxBolusAllowed().value();
|
|
||||||
editInsulin = view.findViewById(R.id.careportal_newnstreatment_insulininput);
|
|
||||||
editInsulin.setParams(0d, 0d, maxInsulin, 0.05d, new DecimalFormat("0.00"), false, view.findViewById(R.id.ok));
|
|
||||||
|
|
||||||
editSplit = view.findViewById(R.id.careportal_newnstreatment_splitinput);
|
|
||||||
editSplit.setParams(100d, 0d, 100d, 5d, new DecimalFormat("0"), true, view.findViewById(R.id.ok));
|
|
||||||
editDuration = view.findViewById(R.id.careportal_newnstreatment_durationinput);
|
|
||||||
editDuration.setParams(0d, 0d, Constants.MAX_PROFILE_SWITCH_DURATION, 10d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
|
|
||||||
|
|
||||||
TextWatcher percentTextWatcher = new TextWatcher() {
|
|
||||||
@Override
|
|
||||||
public void afterTextChanged(Editable s) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void beforeTextChanged(CharSequence s, int start,
|
|
||||||
int count, int after) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTextChanged(CharSequence s, int start,
|
|
||||||
int before, int count) {
|
|
||||||
layoutPercent.setVisibility(View.VISIBLE);
|
|
||||||
layoutAbsolute.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Integer maxPercent = 200;
|
|
||||||
if (profile != null)
|
|
||||||
maxPercent = constraintChecker.getMaxBasalPercentAllowed(profile).value();
|
|
||||||
editPercent = view.findViewById(R.id.careportal_newnstreatment_percentinput);
|
|
||||||
editPercent.setParams(0d, -100d, (double) maxPercent, 5d, new DecimalFormat("0"), true, view.findViewById(R.id.ok), percentTextWatcher);
|
|
||||||
|
|
||||||
TextWatcher absoluteTextWatcher = new TextWatcher() {
|
|
||||||
@Override
|
|
||||||
public void afterTextChanged(Editable s) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void beforeTextChanged(CharSequence s, int start,
|
|
||||||
int count, int after) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTextChanged(CharSequence s, int start,
|
|
||||||
int before, int count) {
|
|
||||||
layoutPercent.setVisibility(View.GONE);
|
|
||||||
layoutAbsolute.setVisibility(View.VISIBLE);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Double maxAbsolute = hardLimits.maxBasal();
|
|
||||||
if (profile != null)
|
|
||||||
maxAbsolute = constraintChecker.getMaxBasalAllowed(profile).value();
|
|
||||||
editAbsolute = view.findViewById(R.id.careportal_newnstreatment_absoluteinput);
|
|
||||||
editAbsolute.setParams(0d, 0d, maxAbsolute, 0.05d, new DecimalFormat("0.00"), true, view.findViewById(R.id.ok), absoluteTextWatcher);
|
|
||||||
|
|
||||||
editCarbTime = view.findViewById(R.id.careportal_newnstreatment_carbtimeinput);
|
|
||||||
editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
|
|
||||||
|
|
||||||
editPercentage = view.findViewById(R.id.careportal_newnstreatment_percentage);
|
|
||||||
editPercentage.setParams(100d, (double) Constants.CPP_MIN_PERCENTAGE, (double) Constants.CPP_MAX_PERCENTAGE, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
|
|
||||||
|
|
||||||
editTimeshift = view.findViewById(R.id.careportal_newnstreatment_timeshift);
|
|
||||||
editTimeshift.setParams(0d, (double) Constants.CPP_MIN_TIMESHIFT, (double) Constants.CPP_MAX_TIMESHIFT, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
|
|
||||||
|
|
||||||
ProfileSwitch ps = treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now());
|
|
||||||
if (ps != null && ps.isCPP) {
|
|
||||||
final int percentage = ps.percentage;
|
|
||||||
final int timeshift = ps.timeshift;
|
|
||||||
reuseButton.setText(reuseButton.getText() + " " + percentage + "% " + timeshift + "h");
|
|
||||||
reuseButton.setOnClickListener(v -> {
|
|
||||||
editPercentage.setValue((double) percentage);
|
|
||||||
editTimeshift.setValue((double) timeshift);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (ps == null) {
|
|
||||||
options.duration = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_eventtime_layout), options.date);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_bg_layout), options.bg);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_bgsource_layout), options.bg);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_insulin_layout), options.insulin);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_carbs_layout), options.carbs);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_split_layout), options.split);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_duration_layout), options.duration);
|
|
||||||
showOrHide(layoutPercent, options.percent);
|
|
||||||
showOrHide(layoutAbsolute, options.absolute);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_carbtime_layout), options.prebolus);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_profile_layout), options.profile);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_percentage_layout), options.profile);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_timeshift_layout), options.profile);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_reuse_layout), options.profile && ps != null && ps.isCPP);
|
|
||||||
showOrHide(view.findViewById(R.id.careportal_newnstreatment_temptarget_layout), options.tempTarget);
|
|
||||||
|
|
||||||
setCancelable(true);
|
|
||||||
getDialog().setCanceledOnTouchOutside(false);
|
|
||||||
//recovering state if there is something
|
|
||||||
// only numberPickers and editTexts
|
|
||||||
if (savedInstanceState != null) {
|
|
||||||
editBg.setValue(savedInstanceState.getDouble("editBg"));
|
|
||||||
editTemptarget.setValue(savedInstanceState.getDouble("editTemptarget"));
|
|
||||||
notesEdit.setText(savedInstanceState.getString("notesEdit"));
|
|
||||||
editCarbs.setValue(savedInstanceState.getDouble("editCarbs"));
|
|
||||||
editCarbs.setValue(savedInstanceState.getDouble("editCarbs"));
|
|
||||||
editInsulin.setValue(savedInstanceState.getDouble("editInsulin"));
|
|
||||||
editDuration.setValue(savedInstanceState.getDouble("editDuration"));
|
|
||||||
editPercent.setValue(savedInstanceState.getDouble("editPercent"));
|
|
||||||
editAbsolute.setValue(savedInstanceState.getDouble("editAbsolute"));
|
|
||||||
editCarbTime.setValue(savedInstanceState.getDouble("editCarbTime"));
|
|
||||||
editPercentage.setValue(savedInstanceState.getDouble("editPercentage"));
|
|
||||||
editTimeshift.setValue(savedInstanceState.getDouble("editTimeshift"));
|
|
||||||
// time and date
|
|
||||||
dateButton.setText(savedInstanceState.getString("dateButton"));
|
|
||||||
timeButton.setText(savedInstanceState.getString("timeButton"));
|
|
||||||
}
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClick(View view) {
|
|
||||||
Calendar calendar = Calendar.getInstance();
|
|
||||||
calendar.setTime(eventTime);
|
|
||||||
switch (view.getId()) {
|
|
||||||
case R.id.careportal_newnstreatment_eventdate:
|
|
||||||
DatePickerDialog dpd = DatePickerDialog.newInstance(
|
|
||||||
this,
|
|
||||||
calendar.get(Calendar.YEAR),
|
|
||||||
calendar.get(Calendar.MONTH),
|
|
||||||
calendar.get(Calendar.DAY_OF_MONTH)
|
|
||||||
);
|
|
||||||
dpd.setThemeDark(true);
|
|
||||||
dpd.dismissOnPause(true);
|
|
||||||
dpd.show(getActivity().getSupportFragmentManager(), "Datepickerdialog");
|
|
||||||
break;
|
|
||||||
case R.id.careportal_newnstreatment_eventtime:
|
|
||||||
TimePickerDialog tpd = TimePickerDialog.newInstance(
|
|
||||||
this,
|
|
||||||
calendar.get(Calendar.HOUR_OF_DAY),
|
|
||||||
calendar.get(Calendar.MINUTE),
|
|
||||||
DateFormat.is24HourFormat(getContext())
|
|
||||||
);
|
|
||||||
tpd.setThemeDark(true);
|
|
||||||
tpd.dismissOnPause(true);
|
|
||||||
tpd.show(getActivity().getSupportFragmentManager(), "Timepickerdialog");
|
|
||||||
break;
|
|
||||||
case R.id.ok:
|
|
||||||
confirmNSTreatmentCreation();
|
|
||||||
dismiss();
|
|
||||||
break;
|
|
||||||
case R.id.cancel:
|
|
||||||
dismiss();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showOrHide(ViewGroup layout, boolean visible) {
|
|
||||||
if (visible) layout.setVisibility(View.VISIBLE);
|
|
||||||
else layout.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateBGforDateTime() {
|
|
||||||
long millis = eventTime.getTime() - (150 * 1000L); // 2,5 * 60 * 1000
|
|
||||||
List<BgReading> data = MainApp.getDbHelper().getBgreadingsDataFromTime(millis, true);
|
|
||||||
if ((data.size() > 0) &&
|
|
||||||
(data.get(0).date > millis - 7 * 60 * 1000L) &&
|
|
||||||
(data.get(0).date < millis + 7 * 60 * 1000L)) {
|
|
||||||
editBg.setValue(Profile.fromMgdlToUnits(data.get(0).value, profileFunction.getUnits()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
|
|
||||||
eventTime.setYear(year - 1900);
|
|
||||||
eventTime.setMonth(monthOfYear);
|
|
||||||
eventTime.setDate(dayOfMonth);
|
|
||||||
dateButton.setText(DateUtil.dateString(eventTime));
|
|
||||||
updateBGforDateTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int second) {
|
|
||||||
eventTime.setHours(hourOfDay);
|
|
||||||
eventTime.setMinutes(minute);
|
|
||||||
eventTime.setSeconds(this.seconds++); // randomize seconds to prevent creating record of the same time, if user choose time manually
|
|
||||||
timeButton.setText(dateUtil.timeString(eventTime));
|
|
||||||
updateBGforDateTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
private JSONObject gatherData() {
|
|
||||||
String enteredBy = sp.getString("careportal_enteredby", "");
|
|
||||||
JSONObject data = new JSONObject();
|
|
||||||
try {
|
|
||||||
boolean allowZeroDuration = false;
|
|
||||||
data.put("created_at", DateUtil.toISOString(eventTime));
|
|
||||||
switch (options.eventType) {
|
|
||||||
case R.id.careportal_bgcheck:
|
|
||||||
data.put("eventType", CareportalEvent.BGCHECK);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_announcement:
|
|
||||||
data.put("eventType", CareportalEvent.ANNOUNCEMENT);
|
|
||||||
data.put("isAnnouncement", true);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_cgmsensorinsert:
|
|
||||||
data.put("eventType", CareportalEvent.SENSORCHANGE);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_cgmsensorstart:
|
|
||||||
data.put("eventType", "Sensor Start");
|
|
||||||
break;
|
|
||||||
case R.id.careportal_combobolus:
|
|
||||||
data.put("splitNow", SafeParse.stringToDouble(editSplit.getText()));
|
|
||||||
data.put("splitExt", 100 - SafeParse.stringToDouble(editSplit.getText()));
|
|
||||||
data.put("eventType", CareportalEvent.COMBOBOLUS);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_correctionbolus:
|
|
||||||
data.put("eventType", "Correction Bolus");
|
|
||||||
break;
|
|
||||||
case R.id.careportal_carbscorrection:
|
|
||||||
data.put("eventType", "Carb Correction");
|
|
||||||
break;
|
|
||||||
case R.id.careportal_exercise:
|
|
||||||
data.put("eventType", CareportalEvent.EXERCISE);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_insulincartridgechange:
|
|
||||||
data.put("eventType", CareportalEvent.INSULINCHANGE);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_pumpbatterychange:
|
|
||||||
data.put("eventType", CareportalEvent.PUMPBATTERYCHANGE);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_mealbolus:
|
|
||||||
data.put("eventType", "Meal Bolus");
|
|
||||||
break;
|
|
||||||
case R.id.careportal_note:
|
|
||||||
data.put("eventType", CareportalEvent.NOTE);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_profileswitch:
|
|
||||||
data.put("eventType", CareportalEvent.PROFILESWITCH);
|
|
||||||
allowZeroDuration = true;
|
|
||||||
break;
|
|
||||||
case R.id.careportal_pumpsitechange:
|
|
||||||
data.put("eventType", CareportalEvent.SITECHANGE);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_question:
|
|
||||||
data.put("eventType", CareportalEvent.QUESTION);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_snackbolus:
|
|
||||||
data.put("eventType", "Snack Bolus");
|
|
||||||
break;
|
|
||||||
case R.id.careportal_tempbasalstart:
|
|
||||||
data.put("eventType", CareportalEvent.TEMPBASAL);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_tempbasalend:
|
|
||||||
data.put("eventType", CareportalEvent.TEMPBASAL);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_openapsoffline:
|
|
||||||
data.put("eventType", CareportalEvent.OPENAPSOFFLINE);
|
|
||||||
break;
|
|
||||||
case R.id.careportal_temporarytarget:
|
|
||||||
data.put("eventType", CareportalEvent.TEMPORARYTARGET);
|
|
||||||
if (!reasonSpinner.getSelectedItem().toString().equals(""))
|
|
||||||
data.put("reason", reasonSpinner.getSelectedItem().toString());
|
|
||||||
if (SafeParse.stringToDouble(editTemptarget.getText()) != 0d) {
|
|
||||||
data.put("targetBottom", SafeParse.stringToDouble(editTemptarget.getText()));
|
|
||||||
data.put("targetTop", SafeParse.stringToDouble(editTemptarget.getText()));
|
|
||||||
}
|
|
||||||
allowZeroDuration = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (options.bg && SafeParse.stringToDouble(editBg.getText()) != 0d) {
|
|
||||||
data.put("glucose", SafeParse.stringToDouble(editBg.getText()));
|
|
||||||
if (meterRadioButton.isChecked()) data.put("glucoseType", "Finger");
|
|
||||||
if (sensorRadioButton.isChecked()) data.put("glucoseType", "Sensor");
|
|
||||||
if (otherRadioButton.isChecked()) data.put("glucoseType", "Manual");
|
|
||||||
}
|
|
||||||
if (SafeParse.stringToDouble(editCarbs.getText()) != 0d)
|
|
||||||
data.put("carbs", SafeParse.stringToDouble(editCarbs.getText()));
|
|
||||||
if (SafeParse.stringToDouble(editInsulin.getText()) != 0d)
|
|
||||||
data.put("insulin", SafeParse.stringToDouble(editInsulin.getText()));
|
|
||||||
if (allowZeroDuration || SafeParse.stringToDouble(editDuration.getText()) != 0d)
|
|
||||||
data.put("duration", SafeParse.stringToDouble(editDuration.getText()));
|
|
||||||
if (layoutPercent.getVisibility() != View.GONE)
|
|
||||||
data.put("percent", SafeParse.stringToDouble(editPercent.getText()));
|
|
||||||
if (layoutAbsolute.getVisibility() != View.GONE)
|
|
||||||
data.put("absolute", SafeParse.stringToDouble(editAbsolute.getText()));
|
|
||||||
if (options.profile && profileSpinner.getSelectedItem() != null)
|
|
||||||
data.put("profile", profileSpinner.getSelectedItem().toString());
|
|
||||||
if (options.profile)
|
|
||||||
data.put("percentage", SafeParse.stringToInt(editPercentage.getText()));
|
|
||||||
if (options.profile)
|
|
||||||
data.put("timeshift", SafeParse.stringToInt(editTimeshift.getText()));
|
|
||||||
if (SafeParse.stringToDouble(editCarbTime.getText()) != 0d)
|
|
||||||
data.put("preBolus", SafeParse.stringToDouble(editCarbTime.getText()));
|
|
||||||
if (!notesEdit.getText().toString().equals(""))
|
|
||||||
data.put("notes", notesEdit.getText().toString());
|
|
||||||
data.put("units", profileFunction.getUnits());
|
|
||||||
if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
|
|
||||||
if (options.eventType == R.id.careportal_combobolus) {
|
|
||||||
Double enteredInsulin = SafeParse.stringToDouble(editInsulin.getText());
|
|
||||||
data.put("enteredinsulin", enteredInsulin);
|
|
||||||
data.put("insulin", enteredInsulin * SafeParse.stringToDouble(editSplit.getText()) / 100);
|
|
||||||
data.put("relative", enteredInsulin * (100 - SafeParse.stringToDouble(editSplit.getText())) / 100 / SafeParse.stringToDouble(editDuration.getText()) * 60);
|
|
||||||
}
|
|
||||||
} catch (JSONException e) {
|
|
||||||
aapsLogger.error("Unhandled exception", e);
|
|
||||||
}
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
private String buildConfirmText(JSONObject data) {
|
|
||||||
String ret = "";
|
|
||||||
// if (data.has("eventType")) {
|
|
||||||
// ret += resourceHelper.gs(R.string.careportal_newnstreatment_eventtype);
|
|
||||||
// ret += ": ";
|
|
||||||
// ret += Translator.translate(JsonHelper.safeGetString(data, "eventType", ""));
|
|
||||||
// ret += "\n";
|
|
||||||
// }
|
|
||||||
if (data.has("glucose")) {
|
|
||||||
ret += resourceHelper.gs(R.string.treatments_wizard_bg_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "glucose", "");
|
|
||||||
ret += " " + profileFunction.getUnits() + "\n";
|
|
||||||
}
|
|
||||||
if (data.has("glucoseType")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype);
|
|
||||||
ret += ": ";
|
|
||||||
ret += translator.translate(JsonHelper.safeGetString(data, "glucoseType", ""));
|
|
||||||
ret += "\n";
|
|
||||||
}
|
|
||||||
if (data.has("carbs")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_carbs_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "carbs", "");
|
|
||||||
ret += " g\n";
|
|
||||||
}
|
|
||||||
if (data.has("insulin")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_insulin_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "insulin", "");
|
|
||||||
ret += " U\n";
|
|
||||||
}
|
|
||||||
if (data.has("duration")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_duration_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "duration", "");
|
|
||||||
ret += " min\n";
|
|
||||||
}
|
|
||||||
if (data.has("percent")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_percent_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "percent", "");
|
|
||||||
ret += " %\n";
|
|
||||||
}
|
|
||||||
if (data.has("absolute")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_absolute_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "absolute", "");
|
|
||||||
ret += " U/h\n";
|
|
||||||
}
|
|
||||||
if (data.has("preBolus")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_carbtime_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "preBolus", "");
|
|
||||||
ret += " min\n";
|
|
||||||
}
|
|
||||||
if (data.has("notes")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_notes_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "notes", "");
|
|
||||||
ret += "\n";
|
|
||||||
}
|
|
||||||
if (data.has("profile")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_profile_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "profile", "");
|
|
||||||
ret += "\n";
|
|
||||||
}
|
|
||||||
if (data.has("percentage")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_percentage_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "percentage", "");
|
|
||||||
ret += " %\n";
|
|
||||||
}
|
|
||||||
if (data.has("timeshift")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_timeshift_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "timeshift", "");
|
|
||||||
ret += " h\n";
|
|
||||||
}
|
|
||||||
if (data.has("targetBottom") && data.has("targetTop")) {
|
|
||||||
ret += resourceHelper.gs(R.string.target_range);
|
|
||||||
ret += " ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "targetBottom", "");
|
|
||||||
ret += " - ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "targetTop", "");
|
|
||||||
ret += "\n";
|
|
||||||
}
|
|
||||||
if (data.has("created_at")) {
|
|
||||||
ret += resourceHelper.gs(R.string.event_time_label);
|
|
||||||
ret += ": ";
|
|
||||||
ret += dateUtil.dateAndTimeString(eventTime);
|
|
||||||
ret += "\n";
|
|
||||||
}
|
|
||||||
if (data.has("enteredBy")) {
|
|
||||||
ret += resourceHelper.gs(R.string.careportal_newnstreatment_enteredby_title);
|
|
||||||
ret += ": ";
|
|
||||||
ret += JsonHelper.safeGetObject(data, "enteredBy", "");
|
|
||||||
ret += "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void confirmNSTreatmentCreation() {
|
|
||||||
final JSONObject data = gatherData();
|
|
||||||
OKDialog.showConfirmation(getContext(), translator.translate(JsonHelper.safeGetString(data, "eventType", resourceHelper.gs(R.string.overview_treatment_label))), buildConfirmText(data), () -> nsUpload.createNSTreatment(data, profileStore, profileFunction, eventTime.getTime()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSaveInstanceState(Bundle savedInstanceState) {
|
|
||||||
savedInstanceState.putString("notesEdit", notesEdit.getText().toString());
|
|
||||||
savedInstanceState.putString("dateButton", dateButton.getText().toString());
|
|
||||||
savedInstanceState.putString("timeButton", timeButton.getText().toString());
|
|
||||||
savedInstanceState.putDouble("editBg", editBg.getValue());
|
|
||||||
savedInstanceState.putDouble("editCarbs", editCarbs.getValue());
|
|
||||||
savedInstanceState.putDouble("editInsulin", editInsulin.getValue());
|
|
||||||
savedInstanceState.putDouble("editDuration", editDuration.getValue());
|
|
||||||
savedInstanceState.putDouble("editPercent", editPercent.getValue());
|
|
||||||
savedInstanceState.putDouble("editAbsolute", editAbsolute.getValue());
|
|
||||||
savedInstanceState.putDouble("editCarbTime", editCarbTime.getValue());
|
|
||||||
savedInstanceState.putDouble("editTemptarget", editTemptarget.getValue());
|
|
||||||
savedInstanceState.putDouble("editPercentage", editPercentage.getValue());
|
|
||||||
savedInstanceState.putDouble("editTimeshift", editTimeshift.getValue());
|
|
||||||
super.onSaveInstanceState(savedInstanceState);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
package info.nightscout.androidaps.plugins.general.careportal;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by mike on 05.11.2016.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class OptionsToShow {
|
|
||||||
public int eventType;
|
|
||||||
public int eventName;
|
|
||||||
public boolean date;
|
|
||||||
public boolean bg;
|
|
||||||
public boolean insulin;
|
|
||||||
public boolean carbs;
|
|
||||||
public boolean prebolus;
|
|
||||||
public boolean duration;
|
|
||||||
public boolean percent;
|
|
||||||
public boolean absolute;
|
|
||||||
public boolean profile;
|
|
||||||
public boolean split;
|
|
||||||
public boolean tempTarget;
|
|
||||||
|
|
||||||
public OptionsToShow(int eventType, int eventName) {
|
|
||||||
this.eventType = eventType;
|
|
||||||
this.eventName = eventName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow date() {
|
|
||||||
date = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow bg() {
|
|
||||||
bg = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow insulin() {
|
|
||||||
insulin = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow carbs() {
|
|
||||||
carbs = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow prebolus() {
|
|
||||||
prebolus = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow duration() {
|
|
||||||
duration = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow percent() {
|
|
||||||
percent = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow absolute() {
|
|
||||||
absolute = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow profile() {
|
|
||||||
profile = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow split() {
|
|
||||||
split = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OptionsToShow tempTarget() {
|
|
||||||
tempTarget = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -126,6 +126,13 @@
|
||||||
android:paddingEnd="15dp"
|
android:paddingEnd="15dp"
|
||||||
android:text="@string/careportal" />
|
android:text="@string/careportal" />
|
||||||
|
|
||||||
|
<include
|
||||||
|
android:id="@+id/careportal_stats"
|
||||||
|
layout="@layout/careportal_stats_fragment"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="10dp" />
|
||||||
|
|
||||||
<androidx.gridlayout.widget.GridLayout
|
<androidx.gridlayout.widget.GridLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
@ -218,13 +225,35 @@
|
||||||
app:layout_gravity="fill"
|
app:layout_gravity="fill"
|
||||||
app:layout_row="4" />
|
app:layout_row="4" />
|
||||||
|
|
||||||
</androidx.gridlayout.widget.GridLayout>
|
<info.nightscout.androidaps.utils.SingleClickButton
|
||||||
|
android:id="@+id/actions_announcement"
|
||||||
|
style="@style/ButtonSmallFontStyle"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_announcement"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_announcement"
|
||||||
|
app:layout_column="0"
|
||||||
|
app:layout_columnWeight="1"
|
||||||
|
app:layout_gravity="fill"
|
||||||
|
app:layout_row="5" />
|
||||||
|
|
||||||
<include
|
<info.nightscout.androidaps.utils.SingleClickButton
|
||||||
android:id="@+id/careportal_stats"
|
android:id="@+id/actions_question"
|
||||||
layout="@layout/careportal_stats_fragment"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_question"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_question"
|
||||||
|
app:layout_column="1"
|
||||||
|
app:layout_columnWeight="1"
|
||||||
|
app:layout_gravity="fill"
|
||||||
|
app:layout_row="5" />
|
||||||
|
|
||||||
|
</androidx.gridlayout.widget.GridLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@
|
||||||
<string name="alert_dialog_permission_battery_optimization_failed">This device does not appear to support battery optimization whitelisting - you may experience performance issues.</string>
|
<string name="alert_dialog_permission_battery_optimization_failed">This device does not appear to support battery optimization whitelisting - you may experience performance issues.</string>
|
||||||
|
|
||||||
<string name="description_actions">Some buttons to quickly access common features</string>
|
<string name="description_actions">Some buttons to quickly access common features</string>
|
||||||
<string name="description_careportal">Enter advanced log book entries.</string>
|
|
||||||
<string name="description_config_builder">Used for configuring the active plugins</string>
|
<string name="description_config_builder">Used for configuring the active plugins</string>
|
||||||
<string name="description_objectives">Learning program</string>
|
<string name="description_objectives">Learning program</string>
|
||||||
<string name="description_food">Displays the food presets defined in Nightscout</string>
|
<string name="description_food">Displays the food presets defined in Nightscout</string>
|
||||||
|
|
@ -428,7 +427,6 @@
|
||||||
<string name="virtualpump_shortname">VPUMP</string>
|
<string name="virtualpump_shortname">VPUMP</string>
|
||||||
<string name="profileviewer_shortname">NSPROFILE</string>
|
<string name="profileviewer_shortname">NSPROFILE</string>
|
||||||
<string name="treatments_shortname">TREAT</string>
|
<string name="treatments_shortname">TREAT</string>
|
||||||
<string name="careportal_shortname">CP</string>
|
|
||||||
<string name="objectives_shortname">OBJ</string>
|
<string name="objectives_shortname">OBJ</string>
|
||||||
<string name="wear_shortname">WEAR</string>
|
<string name="wear_shortname">WEAR</string>
|
||||||
<string name="smscommunicator_shortname">SMS</string>
|
<string name="smscommunicator_shortname">SMS</string>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue