feat(app): scan-mode sync, confirmation-gated documents, single-pass product classification
Fixes reported from APK field testing: DO/Product scan mode was inconsistent between the camera drawer and documents screen (now one shared provider, with an orange/green color cue); unconfirmed scans leaked into history with placeholder data before the user tapped confirm (backend now gates GET /documents on a new `confirmed` column, flipped only by PUT); and Product Scan ran the GPU classifier twice, once at upload and again on review (now a single pass at upload, persisted and read directly by the editor). Also removes the unused "Hubungkan ke PO" field and fabricated PO/SO/DO placeholder values from the Product Scan flow, closes out the per-document-polling and save-recovery tasks (6.1/6.3), and splits several touched files to stay under the repo's 256-line guideline. Full detail in docs/iteration-log.md and backend/docs/iteration-log.md. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Rafhan Mazaya FathurrahmanandClaude Sonnet 5 committed
1 parent
2febe0c886
commit
ada6488592
67 files changed
+5705
-1142
No files matched your search
@@ -1,3 +1,6 @@
|
||||
library editor_screen;
|
||||
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
@@ -7,44 +10,25 @@ import '../../main.dart'; // To access localStorageProvider
|
||||
import '../documents/pending_documents_provider.dart';
|
||||
import '../../core/network/api_client.dart';
|
||||
import '../../core/network/api_exception.dart';
|
||||
import 'document_save_action.dart';
|
||||
import 'widgets/header_details_card.dart';
|
||||
import 'widgets/shipment_details_card.dart';
|
||||
import 'widgets/location_details_card.dart';
|
||||
import 'widgets/items_list_card.dart';
|
||||
import 'widgets/confirmation_dialog.dart';
|
||||
|
||||
part 'editor_logic.dart';
|
||||
|
||||
class EditorScreen extends ConsumerStatefulWidget {
|
||||
final String? pendingId;
|
||||
|
||||
|
||||
const EditorScreen({super.key, this.pendingId});
|
||||
|
||||
@override
|
||||
ConsumerState<EditorScreen> createState() => _EditorScreenState();
|
||||
}
|
||||
|
||||
class _EditorScreenState extends ConsumerState<EditorScreen> {
|
||||
DocumentModel? _document;
|
||||
|
||||
// Controllers
|
||||
final _tanggalCtrl = TextEditingController();
|
||||
final _noPoCtrl = TextEditingController();
|
||||
final _noSoCtrl = TextEditingController();
|
||||
final _noDoCtrl = TextEditingController();
|
||||
|
||||
final _kepadaYthCtrl = TextEditingController();
|
||||
final _orderUntukCtrl = TextEditingController();
|
||||
final _alamatCtrl = TextEditingController();
|
||||
final _platTrukCtrl = TextEditingController();
|
||||
final _namaDriverCtrl = TextEditingController();
|
||||
final _namaPenerimaCtrl = TextEditingController();
|
||||
|
||||
final _latitudeCtrl = TextEditingController();
|
||||
final _longitudeCtrl = TextEditingController();
|
||||
|
||||
List<Map<String, TextEditingController>> _itemControllers = [];
|
||||
bool _isAgreed = false;
|
||||
final _formKey = GlobalKey<FormState>();
|
||||
|
||||
class _EditorScreenState extends ConsumerState<EditorScreen> with EditorLogic {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -74,173 +58,6 @@ class _EditorScreenState extends ConsumerState<EditorScreen> {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _loadDocumentData() {
|
||||
if (widget.pendingId == null) return;
|
||||
|
||||
final pendingDocs = ref.read(pendingDocumentsProvider);
|
||||
final pendingDoc = pendingDocs.firstWhere(
|
||||
(doc) => doc.id == widget.pendingId,
|
||||
orElse: () => PendingDocument(id: '', imagePath: '')
|
||||
);
|
||||
|
||||
if (pendingDoc.document != null) {
|
||||
final doc = pendingDoc.document!;
|
||||
setState(() {
|
||||
_document = doc;
|
||||
_tanggalCtrl.text = doc.tanggal;
|
||||
_noPoCtrl.text = doc.noPo;
|
||||
_noSoCtrl.text = doc.noSo;
|
||||
_noDoCtrl.text = doc.noDo;
|
||||
|
||||
_kepadaYthCtrl.text = doc.kepadaYth;
|
||||
_orderUntukCtrl.text = doc.orderUntuk;
|
||||
_alamatCtrl.text = doc.alamat;
|
||||
_platTrukCtrl.text = doc.platTruk;
|
||||
_namaDriverCtrl.text = doc.namaDriver;
|
||||
|
||||
final lat = pendingDoc.latitude ?? doc.latitude;
|
||||
final lng = pendingDoc.longitude ?? doc.longitude;
|
||||
_latitudeCtrl.text = lat != null ? lat.toString() : '-';
|
||||
_longitudeCtrl.text = lng != null ? lng.toString() : '-';
|
||||
|
||||
for (var item in doc.items) {
|
||||
_addItem(
|
||||
sku: item.nomorSku,
|
||||
nama: item.namaBarang,
|
||||
banyak: item.banyak,
|
||||
jumlah: item.jumlah,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _addItem({String sku = '', String nama = '', String banyak = '', String jumlah = ''}) {
|
||||
final skuCtrl = TextEditingController(text: sku);
|
||||
final namaCtrl = TextEditingController(text: nama);
|
||||
final banyakCtrl = TextEditingController(text: banyak);
|
||||
final jumlahCtrl = TextEditingController(text: jumlah);
|
||||
|
||||
setState(() {
|
||||
_itemControllers.add({
|
||||
'sku': skuCtrl,
|
||||
'nama': namaCtrl,
|
||||
'banyak': banyakCtrl,
|
||||
'jumlah': jumlahCtrl,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
void _removeItem(int index) {
|
||||
setState(() {
|
||||
final ctrls = _itemControllers[index];
|
||||
ctrls['sku']?.dispose();
|
||||
ctrls['nama']?.dispose();
|
||||
ctrls['banyak']?.dispose();
|
||||
ctrls['jumlah']?.dispose();
|
||||
_itemControllers.removeAt(index);
|
||||
});
|
||||
}
|
||||
|
||||
void _showConfirmationDialog() {
|
||||
if (!_formKey.currentState!.validate()) return;
|
||||
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
|
||||
),
|
||||
builder: (context) {
|
||||
return ConfirmationDialog(
|
||||
nameController: _namaPenerimaCtrl,
|
||||
initialAgreed: _isAgreed,
|
||||
onConfirm: (agreed, name) {
|
||||
setState(() {
|
||||
_isAgreed = agreed;
|
||||
});
|
||||
Navigator.pop(context);
|
||||
_submitDocument();
|
||||
},
|
||||
);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _submitDocument() async {
|
||||
final pendingDocs = ref.read(pendingDocumentsProvider);
|
||||
final pendingDoc = pendingDocs.firstWhere(
|
||||
(doc) => doc.id == widget.pendingId,
|
||||
orElse: () => PendingDocument(id: '', imagePath: '')
|
||||
);
|
||||
final double? finalLat = pendingDoc.latitude ?? _document?.latitude;
|
||||
final double? finalLng = pendingDoc.longitude ?? _document?.longitude;
|
||||
|
||||
final finalDoc = DocumentModel(
|
||||
id: _document?.id ?? DateTime.now().millisecondsSinceEpoch.toString(),
|
||||
tanggal: _tanggalCtrl.text,
|
||||
noPo: _noPoCtrl.text,
|
||||
noSo: _noSoCtrl.text,
|
||||
noDo: _noDoCtrl.text,
|
||||
kepadaYth: _kepadaYthCtrl.text,
|
||||
orderUntuk: _orderUntukCtrl.text,
|
||||
alamat: _alamatCtrl.text,
|
||||
platTruk: _platTrukCtrl.text,
|
||||
namaDriver: _namaDriverCtrl.text,
|
||||
namaPenerima: _namaPenerimaCtrl.text,
|
||||
latitude: finalLat,
|
||||
longitude: finalLng,
|
||||
items: _itemControllers.map((ctrls) => DocumentItem(
|
||||
nomorSku: ctrls['sku']!.text,
|
||||
namaBarang: ctrls['nama']!.text,
|
||||
banyak: ctrls['banyak']!.text,
|
||||
jumlah: ctrls['jumlah']!.text,
|
||||
)).toList(),
|
||||
createdAt: DateTime.now(),
|
||||
);
|
||||
|
||||
final localStorage = ref.read(localStorageProvider);
|
||||
await localStorage.saveDocument(finalDoc);
|
||||
|
||||
bool syncedToServer = false;
|
||||
String? syncError;
|
||||
try {
|
||||
final apiClient = ref.read(apiClientProvider);
|
||||
await apiClient.client.put(
|
||||
'${AppConfig.fetchDocumentsEndpoint}/${finalDoc.id}',
|
||||
data: finalDoc.toPutPayload(),
|
||||
);
|
||||
syncedToServer = true;
|
||||
} catch (e) {
|
||||
syncError = ApiException.from(e).displayMessage;
|
||||
}
|
||||
|
||||
if (widget.pendingId != null) {
|
||||
if (syncedToServer) {
|
||||
ref.read(pendingDocumentsProvider.notifier).removeDocument(widget.pendingId!);
|
||||
} else {
|
||||
ref.read(pendingDocumentsProvider.notifier).markSyncFailed(
|
||||
widget.pendingId!,
|
||||
finalDoc,
|
||||
'Belum tersinkron ke server: $syncError',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
syncedToServer
|
||||
? const SnackBar(content: Text('Dokumen Berhasil Disimpan!'), backgroundColor: AppConfig.successColor)
|
||||
: const SnackBar(
|
||||
content: Text('Tersimpan lokal, tapi GAGAL sinkron ke server. Cek koneksi lalu retry dari daftar dokumen.'),
|
||||
backgroundColor: Colors.deepOrange,
|
||||
duration: Duration(seconds: 5),
|
||||
),
|
||||
);
|
||||
context.pop(true);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (_document == null) {
|
||||
@@ -286,7 +103,7 @@ class _EditorScreenState extends ConsumerState<EditorScreen> {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: AppConfig.spaceXL),
|
||||
|
||||
|
||||
HeaderDetailsCard(
|
||||
tanggalCtrl: _tanggalCtrl,
|
||||
noPoCtrl: _noPoCtrl,
|
||||
@@ -294,7 +111,7 @@ class _EditorScreenState extends ConsumerState<EditorScreen> {
|
||||
noDoCtrl: _noDoCtrl,
|
||||
),
|
||||
const SizedBox(height: AppConfig.spaceLarge),
|
||||
|
||||
|
||||
ShipmentDetailsCard(
|
||||
kepadaYthCtrl: _kepadaYthCtrl,
|
||||
orderUntukCtrl: _orderUntukCtrl,
|
||||
@@ -303,20 +120,20 @@ class _EditorScreenState extends ConsumerState<EditorScreen> {
|
||||
namaDriverCtrl: _namaDriverCtrl,
|
||||
),
|
||||
const SizedBox(height: AppConfig.spaceLarge),
|
||||
|
||||
|
||||
LocationDetailsCard(
|
||||
latitudeCtrl: _latitudeCtrl,
|
||||
longitudeCtrl: _longitudeCtrl,
|
||||
),
|
||||
const SizedBox(height: AppConfig.spaceLarge),
|
||||
|
||||
|
||||
ItemsListCard(
|
||||
itemControllers: _itemControllers,
|
||||
onRemoveItem: _removeItem,
|
||||
onAddItem: () => _addItem(),
|
||||
),
|
||||
const SizedBox(height: AppConfig.spaceXL),
|
||||
|
||||
|
||||
ElevatedButton(
|
||||
onPressed: _showConfirmationDialog,
|
||||
style: ElevatedButton.styleFrom(
|
||||
|
||||
Reference in new issue
Block a user