dev #1

Merged
aefril merged 128 commits from dev into main 2025-08-13 17:19:48 +00:00
2 changed files with 48 additions and 48 deletions
Showing only changes of commit db06f0dd13 - Show all commits

View File

@ -31,17 +31,16 @@ class ReportPage extends StatefulWidget {
}
class _ReportPageState extends State<ReportPage> {
int selectedMenu = 1;
String title = 'Laporan Penjualan Item';
int selectedMenu = 0;
String title = 'Ringkasan Laporan Penjualan';
DateTime fromDate = DateTime.now().subtract(const Duration(days: 30));
DateTime toDate = DateTime.now();
@override
void initState() {
super.initState();
context.read<ItemSalesReportBloc>().add(
ItemSalesReportEvent.getItemSales(
startDate: fromDate, endDate: toDate),
context.read<SummaryBloc>().add(
SummaryEvent.getSummary(fromDate, toDate),
);
}
@ -112,6 +111,23 @@ class _ReportPageState extends State<ReportPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ReportMenu(
label: 'Ringkasan Laporan Penjualan',
subtitle:
'Ringkasan total penjualan dalam periode tertentu.',
icon: Icons.insert_drive_file_outlined,
onPressed: () {
selectedMenu = 0;
title = 'Ringkasan Laporan Penjualan';
setState(() {});
context.read<SummaryBloc>().add(
SummaryEvent.getSummary(fromDate, toDate),
);
log("Date ${DateFormatter.formatDateTime(fromDate)}");
},
isActive: selectedMenu == 0,
),
ReportMenu(
label: 'Laporan Transaksi',
subtitle:
@ -120,7 +136,7 @@ class _ReportPageState extends State<ReportPage> {
onPressed: () {
context.push(SalesPage(status: 'completed'));
},
isActive: selectedMenu == 0,
isActive: selectedMenu == 1,
),
ReportMenu(
label: 'Laporan Penjualan Item',
@ -128,7 +144,7 @@ class _ReportPageState extends State<ReportPage> {
'Laporan penjualan berdasarkan masing-masing item atau produk.',
icon: Icons.inventory_2_outlined,
onPressed: () {
selectedMenu = 1;
selectedMenu = 2;
title = 'Laporan Penjualan Item';
setState(() {});
context.read<ItemSalesReportBloc>().add(
@ -136,7 +152,7 @@ class _ReportPageState extends State<ReportPage> {
startDate: fromDate, endDate: toDate),
);
},
isActive: selectedMenu == 1,
isActive: selectedMenu == 2,
),
ReportMenu(
label: 'Laporan Penjualan Produk',
@ -144,7 +160,7 @@ class _ReportPageState extends State<ReportPage> {
'Laporan penjualan berdasarkan masing-masing produk.',
icon: Icons.bar_chart_outlined,
onPressed: () {
selectedMenu = 2;
selectedMenu = 3;
title = 'Laporan Penjualan Produk';
setState(() {});
context.read<ProductSalesBloc>().add(
@ -154,23 +170,6 @@ class _ReportPageState extends State<ReportPage> {
),
);
},
isActive: selectedMenu == 2,
),
ReportMenu(
label: 'Ringkasan Laporan Penjualan',
subtitle:
'Ringkasan total penjualan dalam periode tertentu.',
icon: Icons.insert_drive_file_outlined,
onPressed: () {
selectedMenu = 3;
title = 'Ringkasan Laporan Penjualan';
setState(() {});
context.read<SummaryBloc>().add(
SummaryEvent.getSummary(fromDate, toDate),
);
log("Date ${DateFormatter.formatDateTime(fromDate)}");
},
isActive: selectedMenu == 3,
),
ReportMenu(
@ -203,6 +202,26 @@ class _ReportPageState extends State<ReportPage> {
Expanded(
flex: 4,
child: selectedMenu == 0
? BlocBuilder<SummaryBloc, SummaryState>(
builder: (context, state) {
return state.maybeWhen(
orElse: () => const Center(
child: CircularProgressIndicator(),
),
error: (message) {
return Text(message);
},
success: (data) {
return DashboardAnalyticWidget(
data: data,
title: title,
searchDateFormatted: searchDateFormatted,
);
},
);
},
)
: selectedMenu == 1
? BlocBuilder<TransactionReportBloc,
TransactionReportState>(
builder: (context, state) {
@ -217,14 +236,16 @@ class _ReportPageState extends State<ReportPage> {
return TransactionReportWidget(
transactionReport: transactionReport,
title: title,
searchDateFormatted: searchDateFormatted,
headerWidgets: _getTitleReportPageWidget(),
searchDateFormatted:
searchDateFormatted,
headerWidgets:
_getTitleReportPageWidget(),
);
},
);
},
)
: selectedMenu == 1
: selectedMenu == 2
? BlocBuilder<ItemSalesReportBloc,
ItemSalesReportState>(
builder: (context, state) {
@ -248,13 +269,14 @@ class _ReportPageState extends State<ReportPage> {
);
},
)
: selectedMenu == 2
: selectedMenu == 3
? BlocBuilder<ProductSalesBloc,
ProductSalesState>(
builder: (context, state) {
return state.maybeWhen(
orElse: () => const Center(
child: CircularProgressIndicator(),
child:
CircularProgressIndicator(),
),
error: (message) {
return Text(message);
@ -270,28 +292,6 @@ class _ReportPageState extends State<ReportPage> {
);
},
)
: selectedMenu == 3
? BlocBuilder<SummaryBloc, SummaryState>(
builder: (context, state) {
return state.maybeWhen(
orElse: () => const Center(
child:
CircularProgressIndicator(),
),
error: (message) {
return Text(message);
},
success: (data) {
return DashboardAnalyticWidget(
data: data,
title: title,
searchDateFormatted:
searchDateFormatted,
);
},
);
},
)
: selectedMenu == 4
? BlocBuilder<PaymentMethodReportBloc,
PaymentMethodReportState>(

View File

@ -71,7 +71,7 @@ class DashboardAnalyticWidget extends StatelessWidget {
Text(
title,
style: TextStyle(
fontSize: 28,
fontSize: 18,
fontWeight: FontWeight.bold,
color: Color(0xFF1F2937),
),