Compare commits
1 Commits
renovate/e
...
c779c8dc9a
| Author | SHA1 | Date | |
|---|---|---|---|
| c779c8dc9a |
@@ -12,7 +12,7 @@ steps:
|
||||
|
||||
# Frontend
|
||||
- name: web_build
|
||||
image: node:23
|
||||
image: node:24
|
||||
depends_on:
|
||||
- fetch
|
||||
volumes:
|
||||
|
||||
61
moneymgr_backend/Cargo.lock
generated
61
moneymgr_backend/Cargo.lock
generated
@@ -36,9 +36,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "actix-files"
|
||||
version = "0.6.7"
|
||||
version = "0.6.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22c8b5536deb14cd9c3e505bd0e3366e1a12383b659c92f2b4fa4d323d583599"
|
||||
checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be"
|
||||
dependencies = [
|
||||
"actix-http",
|
||||
"actix-service",
|
||||
@@ -46,7 +46,7 @@ dependencies = [
|
||||
"actix-web",
|
||||
"bitflags",
|
||||
"bytes",
|
||||
"derive_more 2.0.1",
|
||||
"derive_more 0.99.20",
|
||||
"futures-core",
|
||||
"http-range",
|
||||
"log",
|
||||
@@ -87,7 +87,7 @@ dependencies = [
|
||||
"mime",
|
||||
"percent-encoding",
|
||||
"pin-project-lite",
|
||||
"rand 0.9.2",
|
||||
"rand 0.9.1",
|
||||
"sha1",
|
||||
"smallvec",
|
||||
"tokio",
|
||||
@@ -364,6 +364,12 @@ dependencies = [
|
||||
"alloc-no-stdlib",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "android-tzdata"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
|
||||
|
||||
[[package]]
|
||||
name = "android_system_properties"
|
||||
version = "0.1.5"
|
||||
@@ -425,9 +431,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.99"
|
||||
version = "1.0.98"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
|
||||
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
||||
|
||||
[[package]]
|
||||
name = "arbitrary"
|
||||
@@ -694,15 +700,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.42"
|
||||
version = "0.4.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
|
||||
checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
|
||||
dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
"num-traits",
|
||||
"wasm-bindgen",
|
||||
"windows-link 0.2.0",
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -717,9 +724,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.47"
|
||||
version = "4.5.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
|
||||
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@@ -727,9 +734,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.47"
|
||||
version = "4.5.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
|
||||
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -739,9 +746,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.47"
|
||||
version = "4.5.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
|
||||
checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -2291,7 +2298,7 @@ dependencies = [
|
||||
"light-openid",
|
||||
"log",
|
||||
"mime_guess",
|
||||
"rand 0.9.2",
|
||||
"rand 0.9.1",
|
||||
"rust-embed",
|
||||
"rust-s3",
|
||||
"rust_xlsxwriter",
|
||||
@@ -2734,9 +2741,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.9.2"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
|
||||
checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
|
||||
dependencies = [
|
||||
"rand_chacha 0.9.0",
|
||||
"rand_core 0.9.3",
|
||||
@@ -3225,9 +3232,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.142"
|
||||
version = "1.0.140"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
|
||||
checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
@@ -3987,7 +3994,7 @@ checksum = "46ec44dc15085cea82cf9c78f85a9114c463a369786585ad2882d1ff0b0acf40"
|
||||
dependencies = [
|
||||
"windows-implement",
|
||||
"windows-interface",
|
||||
"windows-link 0.1.1",
|
||||
"windows-link",
|
||||
"windows-result",
|
||||
"windows-strings 0.4.1",
|
||||
]
|
||||
@@ -4020,12 +4027,6 @@ version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
|
||||
|
||||
[[package]]
|
||||
name = "windows-link"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
|
||||
|
||||
[[package]]
|
||||
name = "windows-registry"
|
||||
version = "0.4.0"
|
||||
@@ -4043,7 +4044,7 @@ version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d"
|
||||
dependencies = [
|
||||
"windows-link 0.1.1",
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4052,7 +4053,7 @@ version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
|
||||
dependencies = [
|
||||
"windows-link 0.1.1",
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4061,7 +4062,7 @@ version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a"
|
||||
dependencies = [
|
||||
"windows-link 0.1.1",
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -8,23 +8,23 @@ env_logger = "0.11.8"
|
||||
log = "0.4.27"
|
||||
diesel = { version = "2.2.12", features = ["postgres", "r2d2"] }
|
||||
diesel_migrations = "2.2.0"
|
||||
clap = { version = "4.5.47", features = ["env", "derive"] }
|
||||
clap = { version = "4.5.41", features = ["env", "derive"] }
|
||||
actix-web = "4.11.0"
|
||||
actix-cors = "0.7.1"
|
||||
actix-multipart = "0.7.2"
|
||||
actix-remote-ip = "0.1.0"
|
||||
actix-session = { version = "0.10.1", features = ["redis-session"] }
|
||||
actix-files = "0.6.7"
|
||||
actix-files = "0.6.6"
|
||||
lazy_static = "1.5.0"
|
||||
anyhow = "1.0.99"
|
||||
anyhow = "1.0.98"
|
||||
serde = { version = "1.0.219", features = ["derive"] }
|
||||
rust-s3 = "0.36.0-beta.2"
|
||||
thiserror = "2.0.12"
|
||||
tokio = "1.45.1"
|
||||
futures-util = "0.3.31"
|
||||
serde_json = "1.0.142"
|
||||
serde_json = "1.0.140"
|
||||
light-openid = "1.0.4"
|
||||
rand = "0.9.2"
|
||||
rand = "0.9.1"
|
||||
ipnet = { version = "2.11.0", features = ["serde"] }
|
||||
lazy-regex = "3.4.1"
|
||||
jwt-simple = { version = "0.12.12", default-features = false, features = ["pure-rust"] }
|
||||
@@ -33,7 +33,7 @@ rust-embed = { version = "8.7.2" }
|
||||
sha2 = "0.11.0-rc.0"
|
||||
base16ct = "0.2.0"
|
||||
httpdate = "1.0.3"
|
||||
chrono = "0.4.42"
|
||||
chrono = "0.4.41"
|
||||
tempfile = "3.20.0"
|
||||
zip = "3.0.0"
|
||||
rust_xlsxwriter = "0.87.0"
|
||||
@@ -29,7 +29,7 @@ pub struct AppConfig {
|
||||
/// Unsecure : for development, bypass authentication, using the account with the given
|
||||
/// email address by default
|
||||
#[clap(long, env)]
|
||||
unsecure_auto_login_email: Option<String>,
|
||||
pub unsecure_auto_login_email: Option<String>,
|
||||
|
||||
/// PostgreSQL database host
|
||||
#[clap(long, env, default_value = "localhost")]
|
||||
@@ -126,14 +126,6 @@ pub struct AppConfig {
|
||||
/// Redis password
|
||||
#[clap(long, env, default_value = "secretredis")]
|
||||
redis_password: String,
|
||||
|
||||
/// Application download URL
|
||||
#[clap(
|
||||
long,
|
||||
env,
|
||||
default_value = "https://gitea.communiquons.org/pierre/MoneyMgr/releases/download/latest/moneymgr_mobile_arm64-v8a.apk"
|
||||
)]
|
||||
pub apk_download_url: String,
|
||||
}
|
||||
|
||||
lazy_static::lazy_static! {
|
||||
@@ -148,17 +140,9 @@ impl AppConfig {
|
||||
&ARGS
|
||||
}
|
||||
|
||||
/// Get auto login email (if not empty)
|
||||
pub fn unsecure_auto_login_email(&self) -> Option<&str> {
|
||||
match self.unsecure_auto_login_email.as_deref() {
|
||||
None | Some("") => None,
|
||||
s => s,
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if auth is disabled
|
||||
pub fn is_auth_disabled(&self) -> bool {
|
||||
self.unsecure_auto_login_email().is_some()
|
||||
self.unsecure_auto_login_email.is_some()
|
||||
}
|
||||
|
||||
/// Get auth cookie domain
|
||||
|
||||
@@ -70,7 +70,6 @@ impl Default for ServerConstraints {
|
||||
struct ServerConfig {
|
||||
auth_disabled: bool,
|
||||
oidc_provider_name: &'static str,
|
||||
apk_download_url: &'static str,
|
||||
accounts_types: &'static [AccountTypeDesc],
|
||||
constraints: ServerConstraints,
|
||||
}
|
||||
@@ -80,7 +79,6 @@ impl Default for ServerConfig {
|
||||
Self {
|
||||
auth_disabled: AppConfig::get().is_auth_disabled(),
|
||||
oidc_provider_name: AppConfig::get().openid_provider().name,
|
||||
apk_download_url: AppConfig::get().apk_download_url.as_str(),
|
||||
constraints: Default::default(),
|
||||
accounts_types: &ACCOUNT_TYPES,
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ impl FromRequest for AuthExtractor {
|
||||
}
|
||||
|
||||
// Check if login is hard-coded as program argument
|
||||
if let Some(email) = &AppConfig::get().unsecure_auto_login_email() {
|
||||
if let Some(email) = &AppConfig::get().unsecure_auto_login_email {
|
||||
let user = users_service::get_user_by_email(email).map_err(|e| {
|
||||
log::error!("Failed to retrieve dev user: {e}");
|
||||
ErrorPreconditionFailed("Unable to retrieve dev user!")
|
||||
|
||||
@@ -38,7 +38,7 @@ async fn main() -> std::io::Result<()> {
|
||||
db_connection::initialize_conn().expect("Failed to connect to PostgresSQL database!");
|
||||
|
||||
// Auto create default account, if requested
|
||||
if let Some(mail) = &AppConfig::get().unsecure_auto_login_email() {
|
||||
if let Some(mail) = &AppConfig::get().unsecure_auto_login_email {
|
||||
users_service::create_or_update_user(mail, "Anonymous")
|
||||
.await
|
||||
.expect("Failed to create default account!");
|
||||
|
||||
@@ -1,31 +1,45 @@
|
||||
import 'dart:io';
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:logging/logging.dart';
|
||||
import 'package:moneymgr_mobile/services/router/routes_list.dart';
|
||||
import 'package:moneymgr_mobile/services/storage/expenses.dart';
|
||||
import 'package:moneymgr_mobile/services/storage/prefs.dart';
|
||||
import 'package:moneymgr_mobile/utils/ocr_utils.dart';
|
||||
import 'package:moneymgr_mobile/utils/pdf_utils.dart';
|
||||
import 'package:moneymgr_mobile/widgets/expense_editor.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:scanbot_sdk/scanbot_sdk.dart';
|
||||
import 'package:scanbot_sdk/scanbot_sdk_ui_v2.dart' hide IconButton, EdgeInsets;
|
||||
|
||||
part 'scan_screen.g.dart';
|
||||
|
||||
/// Scan a document & return generated PDF as byte file
|
||||
@riverpod
|
||||
Future<(Uint8List?, BaseExpenseInfo?)> _scanDocument(Ref ref) async {
|
||||
final prefs = ref.watch(prefsProvider).requireValue;
|
||||
|
||||
final pdf = await scanDocAsPDF();
|
||||
final img = await renderPdf(pdfBytes: pdf);
|
||||
final amount = await extractInfoFromBill(
|
||||
imgBuff: img,
|
||||
extractDates: !prefs.disableExtractDates(),
|
||||
Future<Uint8List?> _scanDocument(Ref ref) async {
|
||||
var configuration = DocumentScanningFlow(
|
||||
appearance: DocumentFlowAppearanceConfiguration(
|
||||
statusBarMode: StatusBarMode.DARK,
|
||||
),
|
||||
cleanScanningSession: true,
|
||||
outputSettings: DocumentScannerOutputSettings(pagesScanLimit: 1),
|
||||
screens: DocumentScannerScreens(
|
||||
review: ReviewScreenConfiguration(enabled: false),
|
||||
),
|
||||
);
|
||||
return (pdf, amount);
|
||||
var documentResult = await ScanbotSdkUiV2.startDocumentScanner(configuration);
|
||||
|
||||
if (documentResult.status != OperationStatus.OK) {
|
||||
throw Exception("Scanner failed with status ${documentResult.status}");
|
||||
}
|
||||
|
||||
// Convert result to PDF
|
||||
var result = await ScanbotSdk.document.createPDFForDocument(
|
||||
PDFFromDocumentParams(
|
||||
documentID: documentResult.data!.uuid,
|
||||
pdfConfiguration: PdfConfiguration(),
|
||||
),
|
||||
);
|
||||
final pdfPath = result.pdfFileUri.replaceFirst("file://", "");
|
||||
return File(pdfPath).readAsBytes();
|
||||
}
|
||||
|
||||
class ScanScreen extends HookConsumerWidget {
|
||||
@@ -38,8 +52,8 @@ class ScanScreen extends HookConsumerWidget {
|
||||
|
||||
restartScan() async {
|
||||
try {
|
||||
ref.invalidate(_scanDocumentProvider);
|
||||
Logger.root.info("Load again startup");
|
||||
final val = ref.refresh(_scanDocumentProvider);
|
||||
Logger.root.info("Load again startup result: $val");
|
||||
} catch (e, s) {
|
||||
Logger.root.shout("Failed to try again startup loading! $e $s");
|
||||
}
|
||||
@@ -48,24 +62,21 @@ class ScanScreen extends HookConsumerWidget {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: switch (scanDocProvider) {
|
||||
AsyncData(:final value) when value.$1 != null => ExpenseEditor(
|
||||
file: value.$1!,
|
||||
initialData: value.$2,
|
||||
AsyncData(:final value) when value != null => ExpenseEditor(
|
||||
file: value,
|
||||
onFinished: (expense) async {
|
||||
await expenses.add(
|
||||
info: expense,
|
||||
fileContent: value.$1!,
|
||||
fileContent: value,
|
||||
fileMimeType: "application/pdf",
|
||||
);
|
||||
if (context.mounted) {
|
||||
context.pushReplacement(scansPage);
|
||||
}
|
||||
restartScan();
|
||||
},
|
||||
onRescan: restartScan,
|
||||
),
|
||||
|
||||
// No data
|
||||
AsyncData(:final value) when value.$1 == null => ScanErrorScreen(
|
||||
AsyncData(:final value) when value == null => ScanErrorScreen(
|
||||
message: "No document scanned!",
|
||||
onTryAgain: restartScan,
|
||||
),
|
||||
|
||||
@@ -22,11 +22,6 @@ class SettingsScreen extends ConsumerWidget {
|
||||
ref.invalidate(prefsProvider);
|
||||
}
|
||||
|
||||
handleToggleDisableExtractDate(v) async {
|
||||
await prefs.setDisableExtractDates(v);
|
||||
ref.invalidate(prefsProvider);
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('Settings')),
|
||||
body: ListView(
|
||||
@@ -45,14 +40,6 @@ class SettingsScreen extends ConsumerWidget {
|
||||
"Do not start camera automatically on application startup",
|
||||
),
|
||||
),
|
||||
SwitchListTile(
|
||||
value: prefs.disableExtractDates(),
|
||||
onChanged: handleToggleDisableExtractDate,
|
||||
title: Text("Do not extract dates"),
|
||||
subtitle: Text(
|
||||
"Do not attempt to extract dates from scanned expenses",
|
||||
),
|
||||
),
|
||||
const Divider(),
|
||||
ListTile(
|
||||
leading: const Icon(Icons.info_outline),
|
||||
|
||||
@@ -23,14 +23,6 @@ extension MoneyMgrSharedPreferences on SharedPreferencesWithCache {
|
||||
await setBool("startOnScansListScreen", start);
|
||||
}
|
||||
|
||||
bool disableExtractDates() {
|
||||
return getBool("disableExtractDates") ?? false;
|
||||
}
|
||||
|
||||
Future<void> setDisableExtractDates(bool disable) async {
|
||||
await setBool("disableExtractDates", disable);
|
||||
}
|
||||
|
||||
ServerConfig? serverConfig() {
|
||||
final json = getString("serverConfig");
|
||||
if (json != null) return ServerConfig.fromJson(jsonDecode(json));
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
import 'dart:math';
|
||||
import 'dart:typed_data';
|
||||
import 'dart:ui' as ui;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart';
|
||||
import 'package:logging/logging.dart';
|
||||
import 'package:moneymgr_mobile/services/storage/expenses.dart';
|
||||
|
||||
/// Attempt to extract information from invoice image
|
||||
Future<BaseExpenseInfo?> extractInfoFromBill({
|
||||
required Uint8List imgBuff,
|
||||
required bool extractDates,
|
||||
}) async {
|
||||
final decodedImage = await decodeImageFromList(imgBuff);
|
||||
|
||||
final byteData = await decodedImage.toByteData(
|
||||
format: ui.ImageByteFormat.rawRgba,
|
||||
);
|
||||
|
||||
final image = InputImage.fromBitmap(
|
||||
bitmap: byteData!.buffer.asUint8List(),
|
||||
width: decodedImage.width,
|
||||
height: decodedImage.height,
|
||||
);
|
||||
|
||||
final textRecognizer = TextRecognizer(script: TextRecognitionScript.latin);
|
||||
final extractionResult = await textRecognizer.processImage(image);
|
||||
|
||||
Logger.root.fine("Expense text: ${extractionResult.text}");
|
||||
|
||||
// Check for highestCost amount on invoice
|
||||
final costRegexp = RegExp(
|
||||
r'([0-9]+([ ]*(\\.|,)[ ]*[0-9]{1,2}){0,1})([ \\t\\n]*(EUR|eur|€)|E)',
|
||||
multiLine: true,
|
||||
caseSensitive: false,
|
||||
);
|
||||
var highestCost = 0.0;
|
||||
for (final match in costRegexp.allMatches(extractionResult.text)) {
|
||||
if (match.groupCount == 0) continue;
|
||||
|
||||
// Process only numeric value
|
||||
final value = (match.group(1) ?? "").replaceAll(",", ".");
|
||||
highestCost = max(highestCost, double.tryParse(value) ?? 0.0);
|
||||
}
|
||||
|
||||
// Check for highestCost amount on invoice
|
||||
final dateRegexp = RegExp(
|
||||
r'([0-3][0-9])(\/|-)([0-1][0-9])(\/|-)((20|)[0-9]{2})',
|
||||
multiLine: false,
|
||||
caseSensitive: false,
|
||||
);
|
||||
final currDate = DateTime.now();
|
||||
DateTime? newest;
|
||||
for (final match in dateRegexp.allMatches(extractionResult.text)) {
|
||||
if (match.groupCount < 6) continue;
|
||||
|
||||
int year = int.tryParse(match.group(5)!) ?? currDate.year;
|
||||
|
||||
try {
|
||||
final date = DateTime(
|
||||
year > 99 ? year : (2000 + year),
|
||||
int.tryParse(match.group(3)!) ?? currDate.month,
|
||||
int.tryParse(match.group(1)!) ?? currDate.day,
|
||||
);
|
||||
|
||||
if (newest == null) {
|
||||
newest = date;
|
||||
} else {
|
||||
newest = DateTime.fromMillisecondsSinceEpoch(
|
||||
max(newest.millisecondsSinceEpoch, date.millisecondsSinceEpoch),
|
||||
);
|
||||
}
|
||||
} catch (e, s) {
|
||||
Logger.root.warning("Failed to parse date! $e$s");
|
||||
}
|
||||
}
|
||||
|
||||
return BaseExpenseInfo(
|
||||
label: null,
|
||||
cost: highestCost,
|
||||
time: extractDates && (newest?.isBefore(currDate) ?? false)
|
||||
? newest!
|
||||
: currDate,
|
||||
);
|
||||
}
|
||||
@@ -6,40 +6,14 @@ import 'package:flutter/material.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import 'package:pdf_image_renderer/pdf_image_renderer.dart';
|
||||
import 'package:scanbot_sdk/scanbot_sdk.dart';
|
||||
import 'package:scanbot_sdk/scanbot_sdk_ui_v2.dart' hide IconButton, EdgeInsets;
|
||||
|
||||
/// Scan document as PDF
|
||||
Future<Uint8List> scanDocAsPDF() async {
|
||||
var configuration = DocumentScanningFlow(
|
||||
appearance: DocumentFlowAppearanceConfiguration(
|
||||
statusBarMode: StatusBarMode.DARK,
|
||||
),
|
||||
cleanScanningSession: true,
|
||||
outputSettings: DocumentScannerOutputSettings(pagesScanLimit: 1),
|
||||
screens: DocumentScannerScreens(
|
||||
review: ReviewScreenConfiguration(enabled: false),
|
||||
),
|
||||
);
|
||||
var documentResult = await ScanbotSdkUiV2.startDocumentScanner(configuration);
|
||||
|
||||
if (documentResult.status != OperationStatus.OK) {
|
||||
throw Exception("Scanner failed with status ${documentResult.status}");
|
||||
}
|
||||
|
||||
// Convert result to PDF
|
||||
var result = await ScanbotSdk.document.createPDFForDocument(
|
||||
PDFFromDocumentParams(
|
||||
documentID: documentResult.data!.uuid,
|
||||
pdfConfiguration: PdfConfiguration(),
|
||||
),
|
||||
);
|
||||
final pdfPath = result.pdfFileUri.replaceFirst("file://", "");
|
||||
return File(pdfPath).readAsBytes();
|
||||
}
|
||||
|
||||
/// Render PDF to image bits
|
||||
Future<Uint8List> renderPdf({String? path, Uint8List? pdfBytes}) async {
|
||||
Future<Uint8List> renderPdf(
|
||||
{
|
||||
String? path,
|
||||
Uint8List? pdfBytes,
|
||||
}) async {
|
||||
assert(path != null || pdfBytes != null);
|
||||
|
||||
// Create temporary file if required
|
||||
@@ -88,4 +62,4 @@ Future<Uint8List> renderPdf({String? path, Uint8List? pdfBytes}) async {
|
||||
await File(path).delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -40,20 +40,6 @@ class ExpenseEditor extends HookConsumerWidget {
|
||||
|
||||
final (:pending, :snapshot, :hasError) = useAsyncTask();
|
||||
|
||||
// Force refresh of field if required
|
||||
final previousData = useState<BaseExpenseInfo?>(null);
|
||||
if (initialData != previousData.value) {
|
||||
previousData.value = initialData;
|
||||
labelController.text = initialData?.label ?? "";
|
||||
costController.text = initialData?.cost.toString() ?? "";
|
||||
timeController.value = initialData?.time ?? DateTime.now();
|
||||
}
|
||||
|
||||
// Clear cost value
|
||||
handleClearCost() {
|
||||
costController.text = "";
|
||||
}
|
||||
|
||||
// Pick a new date
|
||||
handlePickDate() async {
|
||||
final date = await showDatePicker(
|
||||
@@ -108,19 +94,6 @@ class ExpenseEditor extends HookConsumerWidget {
|
||||
}
|
||||
}
|
||||
|
||||
// Open invoice in full screen
|
||||
handleFullScreenInvoice() {
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (c) => Scaffold(
|
||||
appBar: AppBar(title: Text("Expense")),
|
||||
body: SingleChildScrollView(
|
||||
child: PDFViewer(pdfBytes: file, fit: BoxFit.fitWidth),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text("Expense info"),
|
||||
@@ -152,10 +125,7 @@ class ExpenseEditor extends HookConsumerWidget {
|
||||
children: [
|
||||
// Expense preview
|
||||
Expanded(
|
||||
child: GestureDetector(
|
||||
onTap: handleFullScreenInvoice,
|
||||
child: PDFViewer(pdfBytes: file, fit: BoxFit.contain),
|
||||
),
|
||||
child: PDFViewer(pdfBytes: file, fit: BoxFit.contain),
|
||||
),
|
||||
|
||||
SizedBox(height: 10),
|
||||
@@ -167,13 +137,7 @@ class ExpenseEditor extends HookConsumerWidget {
|
||||
decimal: true,
|
||||
signed: false,
|
||||
),
|
||||
decoration: InputDecoration(
|
||||
labelText: 'Cost',
|
||||
suffixIcon: IconButton(
|
||||
onPressed: handleClearCost,
|
||||
icon: const Icon(Icons.clear),
|
||||
),
|
||||
),
|
||||
decoration: const InputDecoration(labelText: 'Cost'),
|
||||
textInputAction: TextInputAction.done,
|
||||
),
|
||||
|
||||
|
||||
@@ -488,22 +488,6 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "16.0.0"
|
||||
google_mlkit_commons:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: google_mlkit_commons
|
||||
sha256: "8f40fbac10685cad4715d11e6a0d86837d9ad7168684dfcad29610282a88e67a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.11.0"
|
||||
google_mlkit_text_recognition:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: google_mlkit_text_recognition
|
||||
sha256: "96173ad4dd7fd06c660e22ac3f9e9f1798a517fe7e48bee68eeec83853224224"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.15.0"
|
||||
graphs:
|
||||
dependency: transitive
|
||||
description:
|
||||
|
||||
@@ -49,7 +49,7 @@ dependencies:
|
||||
riverpod_annotation: ^2.6.1
|
||||
|
||||
# Implement React hooks in Flutter
|
||||
flutter_hooks: ^0.21.3+1
|
||||
flutter_hooks: ^0.21.2
|
||||
|
||||
# Router
|
||||
go_router: ^16.0.0
|
||||
@@ -84,7 +84,7 @@ dependencies:
|
||||
# Document scanner
|
||||
# flutter_doc_scanner: ^0.0.16 # no bundled support yet
|
||||
# https://developers.google.com/ml-kit/tips/installation-paths
|
||||
scanbot_sdk: ^7.0.1
|
||||
scanbot_sdk: ^7.0.0
|
||||
|
||||
# Get documents path
|
||||
path_provider: ^2.1.5
|
||||
@@ -93,9 +93,6 @@ dependencies:
|
||||
# PDF renderer
|
||||
pdf_image_renderer: ^1.0.1
|
||||
|
||||
# Text extraction
|
||||
google_mlkit_text_recognition: ^0.15.0
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
@@ -111,7 +108,7 @@ dev_dependencies:
|
||||
flutter_launcher_icons: ^0.14.4
|
||||
|
||||
# Generate source code
|
||||
build_runner: ^2.6.1
|
||||
build_runner: ^2.5.4
|
||||
|
||||
# Riverpod code generation
|
||||
riverpod_generator: ^2.6.5
|
||||
|
||||
2812
moneymgr_web/package-lock.json
generated
2812
moneymgr_web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -12,38 +12,38 @@
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.1",
|
||||
"@fontsource/roboto": "^5.2.7",
|
||||
"@fontsource/roboto": "^5.2.6",
|
||||
"@jsonjoy.com/base64": "^1.1.2",
|
||||
"@mdi/js": "^7.4.47",
|
||||
"@mdi/react": "^1.6.1",
|
||||
"@mui/icons-material": "^7.1.2",
|
||||
"@mui/material": "^7.1.2",
|
||||
"@mui/x-charts": "^8.10.2",
|
||||
"@mui/x-data-grid": "^8.9.2",
|
||||
"@mui/x-date-pickers": "^8.9.2",
|
||||
"@mui/x-charts": "^8.8.0",
|
||||
"@mui/x-data-grid": "^8.8.0",
|
||||
"@mui/x-date-pickers": "^8.8.0",
|
||||
"date-and-time": "^3.6.0",
|
||||
"dayjs": "^1.11.18",
|
||||
"dayjs": "^1.11.13",
|
||||
"filesize": "^10.1.6",
|
||||
"qrcode.react": "^4.2.0",
|
||||
"react": "^19.1.1",
|
||||
"react-dom": "^19.1.1",
|
||||
"react": "^19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
"react-router": "^7.6.3",
|
||||
"react-router-dom": "^7.6.3",
|
||||
"ts-pattern": "^5.8.0"
|
||||
"ts-pattern": "^5.7.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.33.0",
|
||||
"@types/react": "^19.1.13",
|
||||
"@types/react-dom": "^19.1.9",
|
||||
"@vitejs/plugin-react": "^4.7.0",
|
||||
"eslint": "^9.32.0",
|
||||
"eslint-plugin-react-dom": "^1.53.1",
|
||||
"@eslint/js": "^9.31.0",
|
||||
"@types/react": "^19.1.8",
|
||||
"@types/react-dom": "^19.1.6",
|
||||
"@vitejs/plugin-react": "^4.6.0",
|
||||
"eslint": "^9.26.0",
|
||||
"eslint-plugin-react-dom": "^1.49.0",
|
||||
"eslint-plugin-react-hooks": "^5.2.0",
|
||||
"eslint-plugin-react-refresh": "^00.4.20",
|
||||
"eslint-plugin-react-x": "^1.52.9",
|
||||
"eslint-plugin-react-x": "^1.52.3",
|
||||
"globals": "^16.3.0",
|
||||
"typescript": "~5.8.3",
|
||||
"typescript-eslint": "^8.32.1",
|
||||
"vite": "^6.3.6"
|
||||
"vite": "^6.3.5"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ import { APIClient } from "./ApiClient";
|
||||
export interface ServerConfig {
|
||||
auth_disabled: boolean;
|
||||
oidc_provider_name: string;
|
||||
apk_download_url: string;
|
||||
accounts_types: AccountType[];
|
||||
constraints: ServerConstraints;
|
||||
}
|
||||
|
||||
@@ -280,8 +280,6 @@ function CreatedToken(p: { token: TokenWithSecret }): React.ReactElement {
|
||||
The API token was successfully created. Please note the following
|
||||
information as they won't be available next.
|
||||
<br />
|
||||
API URL : <CopyTextChip text={APIClient.ActualBackendURL()} />
|
||||
<br />
|
||||
Token ID: <CopyTextChip text={p.token.id.toString()} />
|
||||
<br />
|
||||
Token value: <CopyTextChip text={p.token.token} />
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { mdiApi, mdiCash } from "@mdi/js";
|
||||
import Icon from "@mdi/react";
|
||||
import AndroidIcon from "@mui/icons-material/Android";
|
||||
import CloudDownloadIcon from "@mui/icons-material/CloudDownload";
|
||||
import LogoutIcon from "@mui/icons-material/Logout";
|
||||
import SettingsIcon from "@mui/icons-material/Settings";
|
||||
@@ -11,7 +10,6 @@ import MenuItem from "@mui/material/MenuItem";
|
||||
import Toolbar from "@mui/material/Toolbar";
|
||||
import Typography from "@mui/material/Typography";
|
||||
import * as React from "react";
|
||||
import { ServerApi } from "../api/ServerApi";
|
||||
import { useAuthInfo } from "./BaseAuthenticatedPage";
|
||||
import { DarkThemeButton } from "./DarkThemeButtonWidget";
|
||||
import { PublicModeButton } from "./PublicModeButtonWidget";
|
||||
@@ -102,18 +100,6 @@ export function MoneyWebAppBar(p: {
|
||||
</MenuItem>
|
||||
</RouterLink>
|
||||
|
||||
{/* APK download */}
|
||||
<RouterLink to={ServerApi.Config.apk_download_url}>
|
||||
<MenuItem>
|
||||
<ListItemIcon>
|
||||
<AndroidIcon />
|
||||
</ListItemIcon>
|
||||
<ListItemText secondary="Scan expenses from your smartphone">
|
||||
Mobile Application
|
||||
</ListItemText>
|
||||
</MenuItem>
|
||||
</RouterLink>
|
||||
|
||||
<Divider />
|
||||
|
||||
{/* Sign out */}
|
||||
|
||||
Reference in New Issue
Block a user