Commit 3ceecbe
Changed files (4)
lib
components
model
export_import
lib/model/export_import/column.dart
@@ -121,8 +121,9 @@ class BuildInColumn extends ExportColumn {
BuildInColumn._create(this.internalIdentifier, this.csvTitle, String formatString, this._userTitle)
: _formatter = ScriptedFormatter(formatString);
- static final List<BuildInColumn> allColumns = [
+ static final List<ExportColumn> allColumns = [
pulsePressure,
+ formattedTime,
mhDate,
mhSys,
mhDia,
@@ -139,9 +140,14 @@ class BuildInColumn extends ExportColumn {
r'{{$SYS-$DIA}}',
(localizations) => localizations.pulsePressure
);
+ static final formattedTime = TimeColumn.explicit(
+ 'buildin.formattedTime',
+ 'Time',
+ 'dd MMM yyyy, HH:mm'
+ );
// my heart columns
- static final mhDate = BuildInColumn._create(
+ static final mhDate = BuildInColumn._create( // FIXME
'buildin.mhDate',
'DATUM',
r'$FORMAT{$TIMESTAMP,yyyy-MM-dd HH:mm:ss}',
lib/model/export_import/export_configuration.dart
@@ -99,6 +99,12 @@ class ActiveExportColumnConfiguration extends ChangeNotifier {
BuildInColumn.mhWeight,
BuildInColumn.mhOxygen,
],
+ ExportImportPreset.bloodPressureAppPdf => [
+ BuildInColumn.formattedTime,
+ NativeColumn.systolic,
+ NativeColumn.diastolic,
+ NativeColumn.pulse,
+ ]
});
}
@@ -112,18 +118,26 @@ enum ExportImportPreset {
///
/// All [NativeColumn]s.
bloodPressureApp,
+
+ /// Default preset for pdf exports.
+ ///
+ /// Includes time, sys, dia, pu
+ bloodPressureAppPdf,
+
myHeart;
String localize(AppLocalizations localizations) => switch (this) {
ExportImportPreset.none => localizations.custom,
ExportImportPreset.bloodPressureApp => localizations.default_,
+ ExportImportPreset.bloodPressureAppPdf => localizations.pdf,
ExportImportPreset.myHeart => '"My Heart" export'
};
int encode() => switch (this) {
ExportImportPreset.none => 0,
ExportImportPreset.bloodPressureApp => 1,
- ExportImportPreset.myHeart => 2
+ ExportImportPreset.myHeart => 2,
+ ExportImportPreset.bloodPressureAppPdf => 3,
};
static ExportImportPreset? decode(dynamic e) {
@@ -131,6 +145,7 @@ enum ExportImportPreset {
0 => ExportImportPreset.none,
1 => ExportImportPreset.bloodPressureApp,
2 => ExportImportPreset.myHeart,
+ 3 => ExportImportPreset.bloodPressureAppPdf,
_ => (){
assert(e is! int, 'non ints can happen through bad user values, other ints can happen as well, but should developers should be notified.');
return null;
lib/model/storage/export_pdf_settings_store.dart
@@ -112,7 +112,9 @@ class PdfExportSettings extends ChangeNotifier implements CustomFieldsSettings {
notifyListeners();
}
- ActiveExportColumnConfiguration _exportFieldsConfiguration = ActiveExportColumnConfiguration();
+ ActiveExportColumnConfiguration _exportFieldsConfiguration = ActiveExportColumnConfiguration(
+ activePreset: ExportImportPreset.bloodPressureAppPdf, // TODO: update function
+ );
@override
ActiveExportColumnConfiguration get exportFieldsConfiguration => _exportFieldsConfiguration;