1.4.1 (build 42): contribución por snapshot, fixes Period vs Period y navegación iPad
- 151: contribución editable por snapshot en cualquier modo (quitado gate detailed) con diálogo de propagación al editar: solo este / adelante / atrás / todos (SnapshotRepository.propagateContribution, SnapshotFormViewModel.contributionChanged) - 148: Period vs Period mostraba mal el último mes del period B — la agrupación usaba chartMonth(for:) que aplicaba el grace-period del check-in a snapshots históricos; ahora agrupa por mes calendario crudo - 152: iPad Sources no saltaba entre fuentes — añadido .id() al SourceDetailView para recrear el StateObject al cambiar de selección - 146/147: Year vs Year con forecast del año en curso (asterisco de estimado) y KPIs arriba / detalle debajo - 145: card de contribución mensual en SourceDetailView - Nuevas claves snapshot_contribution_propagate_* en los 7 idiomas Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015qUZrBusG82T37R7PeokqJ
This commit is contained in:
@@ -11,6 +11,7 @@ struct QuickUpdateView: View {
|
||||
) private var sources: FetchedResults<InvestmentSource>
|
||||
|
||||
@State private var values: [NSManagedObjectID: String] = [:]
|
||||
@State private var contributions: [NSManagedObjectID: String] = [:]
|
||||
@State private var isSaving = false
|
||||
@State private var saveError: String?
|
||||
|
||||
@@ -62,30 +63,51 @@ struct QuickUpdateView: View {
|
||||
} message: {
|
||||
Text(saveError ?? "")
|
||||
}
|
||||
.onAppear { prefillContributions() }
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func sourceRow(_ source: InvestmentSource) -> some View {
|
||||
HStack {
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(source.name)
|
||||
.font(.subheadline.weight(.medium))
|
||||
if source.latestValue != .zero {
|
||||
Text(source.latestValue.currencyString)
|
||||
VStack(spacing: 6) {
|
||||
HStack {
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text(source.name)
|
||||
.font(.subheadline.weight(.medium))
|
||||
if source.latestValue != .zero {
|
||||
Text(source.latestValue.currencyString)
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
Spacer()
|
||||
TextField(
|
||||
String(localized: "quick_update_placeholder"),
|
||||
text: valueBinding(for: source)
|
||||
)
|
||||
.keyboardType(.decimalPad)
|
||||
.multilineTextAlignment(.trailing)
|
||||
.frame(width: 120)
|
||||
.font(.subheadline)
|
||||
}
|
||||
|
||||
if contributions[source.objectID] != nil {
|
||||
HStack {
|
||||
Text(String(localized: "quick_update_contribution_label"))
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
Spacer()
|
||||
TextField(
|
||||
String(localized: "quick_update_contribution_placeholder"),
|
||||
text: contributionBinding(for: source)
|
||||
)
|
||||
.keyboardType(.decimalPad)
|
||||
.multilineTextAlignment(.trailing)
|
||||
.frame(width: 120)
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
Spacer()
|
||||
TextField(
|
||||
String(localized: "quick_update_placeholder"),
|
||||
text: binding(for: source)
|
||||
)
|
||||
.keyboardType(.decimalPad)
|
||||
.multilineTextAlignment(.trailing)
|
||||
.frame(width: 120)
|
||||
.font(.subheadline)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,13 +115,28 @@ struct QuickUpdateView: View {
|
||||
values.filter { !$0.value.trimmingCharacters(in: .whitespaces).isEmpty }
|
||||
}
|
||||
|
||||
private func binding(for source: InvestmentSource) -> Binding<String> {
|
||||
private func valueBinding(for source: InvestmentSource) -> Binding<String> {
|
||||
Binding(
|
||||
get: { values[source.objectID] ?? "" },
|
||||
set: { values[source.objectID] = $0 }
|
||||
)
|
||||
}
|
||||
|
||||
private func contributionBinding(for source: InvestmentSource) -> Binding<String> {
|
||||
Binding(
|
||||
get: { contributions[source.objectID] ?? "" },
|
||||
set: { contributions[source.objectID] = $0 }
|
||||
)
|
||||
}
|
||||
|
||||
private func prefillContributions() {
|
||||
for source in sources {
|
||||
if let amount = MonthlyContributionStore.contribution(for: source.id) {
|
||||
contributions[source.objectID] = String(format: "%.2f", NSDecimalNumber(decimal: amount).doubleValue)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func saveAll() {
|
||||
isSaving = true
|
||||
let now = Date()
|
||||
@@ -114,10 +151,20 @@ struct QuickUpdateView: View {
|
||||
snapshot.value = NSDecimalNumber(decimal: value)
|
||||
snapshot.date = now
|
||||
snapshot.source = source
|
||||
|
||||
if let contribRaw = contributions[source.objectID],
|
||||
!contribRaw.trimmingCharacters(in: .whitespaces).isEmpty,
|
||||
let contrib = CurrencyFormatter.parseUserInput(contribRaw) {
|
||||
snapshot.contribution = NSDecimalNumber(decimal: contrib)
|
||||
}
|
||||
}
|
||||
|
||||
do {
|
||||
try context.save()
|
||||
// Reschedule source reminders so they reflect the new snapshots
|
||||
for source in sources where values[source.objectID].map({ !$0.isEmpty }) == true {
|
||||
NotificationService.shared.scheduleReminder(for: source)
|
||||
}
|
||||
dismiss()
|
||||
} catch {
|
||||
saveError = error.localizedDescription
|
||||
|
||||
Reference in New Issue
Block a user