Merge branch 'dev' into adjusttargetsse
This commit is contained in:
Milos Kozak
GitHub
commit
ceaf4f7f78
|
|
@ -76,19 +76,23 @@ public class TempTargetRangeFragment extends Fragment implements View.OnClickLis
|
|||
NSProfile profile = ConfigBuilderPlugin.getActiveProfile().getProfile();
|
||||
if (profile == null) return;
|
||||
TempTarget tempTarget = tempTargetList.get(position);
|
||||
holder.date.setText(DateUtil.dateAndTimeString(tempTarget.timeStart) + " - " + DateUtil.timeString(tempTargetList.get(position).getPlannedTimeEnd()));
|
||||
holder.duration.setText(DecimalFormatter.to0Decimal(tempTarget.duration) + " min");
|
||||
holder.low.setText(tempTarget.lowValueToUnitsToString(profile.getUnits()));
|
||||
holder.high.setText(tempTarget.highValueToUnitsToString(profile.getUnits()));
|
||||
holder.reason.setText(tempTarget.reason);
|
||||
if (tempTarget.isInProgress())
|
||||
holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.colorInProgress));
|
||||
else if (tempTarget.duration == 0){
|
||||
if (tempTarget.duration != 0) {
|
||||
holder.date.setText(DateUtil.dateAndTimeString(tempTarget.timeStart) + " - " + DateUtil.timeString(tempTargetList.get(position).getPlannedTimeEnd()));
|
||||
holder.duration.setText(DecimalFormatter.to0Decimal(tempTarget.duration) + " min");
|
||||
holder.low.setText(tempTarget.lowValueToUnitsToString(profile.getUnits()));
|
||||
holder.high.setText(tempTarget.highValueToUnitsToString(profile.getUnits()));
|
||||
holder.reason.setText(tempTarget.reason);
|
||||
} else {
|
||||
holder.date.setText(DateUtil.dateAndTimeString(tempTarget.timeStart));
|
||||
holder.duration.setText(R.string.cancel);
|
||||
holder.low.setText("");
|
||||
holder.high.setText("");
|
||||
holder.duration.setText(R.string.cancel);
|
||||
holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.notificationUrgent));
|
||||
holder.reason.setText("");
|
||||
holder.reasonLabel.setText("");
|
||||
holder.reasonColon.setText("");
|
||||
}
|
||||
if (tempTarget.isInProgress())
|
||||
holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.colorInProgress));
|
||||
else
|
||||
holder.dateLinearLayout.setBackgroundColor(MainApp.instance().getResources().getColor(R.color.cardColorBackground));
|
||||
holder.remove.setTag(tempTarget);
|
||||
|
|
@ -111,6 +115,8 @@ public class TempTargetRangeFragment extends Fragment implements View.OnClickLis
|
|||
TextView low;
|
||||
TextView high;
|
||||
TextView reason;
|
||||
TextView reasonLabel;
|
||||
TextView reasonColon;
|
||||
TextView remove;
|
||||
LinearLayout dateLinearLayout;
|
||||
|
||||
|
|
@ -122,6 +128,8 @@ public class TempTargetRangeFragment extends Fragment implements View.OnClickLis
|
|||
low = (TextView) itemView.findViewById(R.id.temptargetrange_low);
|
||||
high = (TextView) itemView.findViewById(R.id.temptargetrange_high);
|
||||
reason = (TextView) itemView.findViewById(R.id.temptargetrange_reason);
|
||||
reasonLabel = (TextView) itemView.findViewById(R.id.temptargetrange_reason_label);
|
||||
reasonColon = (TextView) itemView.findViewById(R.id.temptargetrange_reason_colon);
|
||||
remove = (TextView) itemView.findViewById(R.id.temptargetrange_remove);
|
||||
remove.setOnClickListener(this);
|
||||
remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@
|
|||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/temptargetrange_reason_label"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top"
|
||||
|
|
@ -93,6 +94,7 @@
|
|||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/temptargetrange_reason_colon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingRight="5dp"
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
<string name="reason">Razón</string>
|
||||
<string name="glucose">Glucosa</string>
|
||||
<string name="delta">Delta</string>
|
||||
<string name="avgdelta">Avg. delta</string>
|
||||
<string name="avgdelta">Delta Media</string>
|
||||
|
||||
<string name="configbuilder">Config Builder</string>
|
||||
<string name="objectives">Objetivos</string>
|
||||
|
|
@ -197,8 +197,8 @@
|
|||
<string name="nav_export">Exportar ajustes</string>
|
||||
<string name="nav_import">Importar ajustes</string>
|
||||
<string name="de_lang">German</string>
|
||||
<string name="openapsma_low_summary">Valor mínimo de BG para estar en rango.</string>
|
||||
<string name="openapsma_high_summary">Valor máximo BG para estar en rango.</string>
|
||||
<string name="openapsma_low_summary">Valor mínimo de BG para estar en rango</string>
|
||||
<string name="openapsma_high_summary">Valor máximo BG para estar en rango</string>
|
||||
<string name="openapsma_maxbasal_summary">Max valor U / hr en Basal temporal</string>
|
||||
<string name="openapsma_maxiob_summary">Máximos basales IOB para OpenAPS [U]</string>
|
||||
<string name="bg_lang">Bulgarian</string>
|
||||
|
|
@ -239,7 +239,7 @@
|
|||
<string name="smscommunicator_allowednumbers">Números de teléfono permitidos</string>
|
||||
<string name="smscommunicator_allowednumbers_summary">XXXXXXXXXX +; + YYYYYYYYYY</string>
|
||||
<string formatted="false" name="smscommunicator_bolusreplywithcode">Para entregar bolo% .2fU responder con código% s</string>
|
||||
<string name="smscommunicator_bolusfailed">bolo falló</string>
|
||||
<string name="smscommunicator_bolusfailed">Bolo falló</string>
|
||||
<string formatted="false" name="bolusdelivered">Bolo% .2fU entregado con éxito</string>
|
||||
<string formatted="false" name="bolusdelivering">Entregando% .2fU</string>
|
||||
<string name="smscommunicator_remotebolusnotallowed">Bolo remoto no permitido</string>
|
||||
|
|
@ -358,5 +358,51 @@
|
|||
<string name="configbuilder_shortname">" "</string>
|
||||
<string name="circadian_percentage_profile_shortname">" "</string>
|
||||
<string name="careportal_shortname">" "</string>
|
||||
<string name="activity">Actividad</string>
|
||||
<string name="alert_dialog_storage_permission_text">Por favo reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardara registros (importantes para trazar y verificar que el algoritmo funciona correctamente)</string>
|
||||
<string name="array_of_elements">Matriz de %d elementos. Valor actual:</string>
|
||||
<string name="basal_rate">Ratio Basal:</string>
|
||||
<string name="basalvaluebelowminimum">Valor basal menor del mínimo. Perfil no fijado.</string>
|
||||
<string name="base_profile_label">Perfil Base</string>
|
||||
<string name="button1">Botón 1</string>
|
||||
<string name="button2">Botón 2</string>
|
||||
<string name="button3">Botón 3</string>
|
||||
<string name="careportal_temptarget">Objetivo Temporal</string>
|
||||
<string name="danar_disableeasymode">Inhabilitar EasyUI modo en bomba</string>
|
||||
<string name="danar_enableextendedbolus">Habilitar bolos extendidos en bomba</string>
|
||||
<string name="danar_switchtouhmode">Cambio de modo de U/d a U/h en bomba</string>
|
||||
<string name="eatingsoon">Comida temprano</string>
|
||||
<string name="high_mark">Marca ALTA</string>
|
||||
<string name="initializing">Iniciando . . .</string>
|
||||
<string name="localprofile">Perfil Local</string>
|
||||
<string name="long_avgdelta">Media Larga Delta</string>
|
||||
<string name="low_mark">Marca BAJO</string>
|
||||
<string name="lowbattery">Batería Baja</string>
|
||||
<string name="minago">%dmin antes</string>
|
||||
<string name="openapsama_useautosens">Usar característica AMA autosens</string>
|
||||
<string name="openapsma_autosensdata_label">Datos Autosens</string>
|
||||
<string name="percentagefactor_hint">Factor porcentual para multiplicar el perfil base</string>
|
||||
<string name="prefs_range_summary">Marcas Alta y Baja para graficos en Sinopsis y Smartwatch</string>
|
||||
<string name="prefs_range_title">Rango de visualización</string>
|
||||
<string name="profile_set_ok">Perfil basal actualizado en bomba</string>
|
||||
<string name="profile_set_failed">Error en ajuste de perfil basal</string>
|
||||
<string name="pumpNotInitializedProfileNotSet">Bomba no iniciada, ¡perfil no ajustado!</string>
|
||||
<string name="pumperror">Error en bomba</string>
|
||||
<string name="pumpshutdown">Apagando Bomba</string>
|
||||
<string name="refreshtemptargetsfromnightscout">¿Quiere actualizar objetivo temporal desde Nightscout?</string>
|
||||
<string name="removerecord">Eliminar registro:</string>
|
||||
<string name="resend_all_data">Enviar todos los datos</string>
|
||||
<string name="send_to_pump">ENVIAR A BOMBA</string>
|
||||
<string name="short_avgdelta">Media corta delta</string>
|
||||
<string name="sms_bolus">Bolo:</string>
|
||||
<string name="sms_lastbg">Ultimo BG:</string>
|
||||
<string name="sms_minago">%dmin antes</string>
|
||||
<string name="smscommunicator_bolusdelivered">Bolo %.2fU enviado correctamente</string>
|
||||
<string name="target_range">Rango Objetivo:</string>
|
||||
<string name="temptargetrange">Objetivo Temp</string>
|
||||
<string name="temptargetrange_refreshfromnightscout">Actualizar objetivo temporal desde NS</string>
|
||||
<string name="timeshift_hint"></string>
|
||||
<string name="units">Unidades:</string>
|
||||
<string name="openapsama_autosens_adjusttargets">Reajuste objetivos por autosens</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in a new issue