[Homepage] 3. add row transaksi

app_petty_cash/lib/app/constant.dart

@@ -535,6 +535,14 @@ class Constant {
     );
   }
 
+  //homepage
+  static TextStyle titleH6_700({required BuildContext context}) {
+    return TextStyle(
+      fontSize: Constant.getActualYPhone(context: context, y: 18),
+      fontWeight: FontWeight.w700,
+    );
+  }
+
   // pendaftaran pasien
   static TextStyle titleH5_600({required BuildContext context}) {
     return TextStyle(

app_petty_cash/lib/app/route.dart

@@ -1,3 +1,5 @@
+import 'package:app_petty_cash/screen/home/homepage_screen.dart';
+
 import '../screen/change_company/change_company.dart';
 import 'package:flutter/material.dart';
 
@@ -98,7 +100,8 @@ class AppRoute {
             textScaleFactor: 1.0,
             padding: EdgeInsets.all(0),
           ),
-          child: HomeScreen(),
+          // child: HomeScreen(),
+          child: HomePageScreen(),
         );
       });
     }

app_petty_cash/lib/main.dart

@@ -38,11 +38,12 @@ class MyApp extends StatelessWidget {
         },
       ),
       debugShowCheckedModeBanner: false,
-      initialRoute: loginRoute,
+      // initialRoute: loginRoute,
       // initialRoute: splashScreen,
       // initialRoute: transaksiRoute,
       // initialRoute: reportRoute,
       // initialRoute: testFilePickerRoute,
+      initialRoute: homeRoute,
       onGenerateRoute: AppRoute.generateRoute,
     );
   }

app_petty_cash/lib/repository/transaksi_repository.dart

@@ -121,34 +121,4 @@ class TransaksiRepository extends BaseRepository {
     });
     return result;
   }
-
-  // delete transaksi
-  Future<String> deleteTransaksi(
-    String id,
-    String userid,
-  ) async {
-
-    final service =
-        "${Constant.baseUrlDevone}transaction/deletetransaction/?id=$id&userid=$userid";
-    final resp = await get(
-      // param: {
-      //   "": "",
-      // },
-      service: service,
-    );
-
-    print("url delete transaksi : $service");
-
-    // final result = List<ListCategory>.empty(growable: true);
-    // resp['data'].forEach((e) {
-    //   final model = ListCategory.fromJson(e);
-    //   result.add(model);
-    // });
-
-    if(resp['status'] != "OK"){
-      return resp['message'];
-    }
-
-    return resp['status'];
-  }
 }

app_petty_cash/lib/screen/home/homepage_screen.dart

@@ -0,0 +1,279 @@
+import 'package:app_petty_cash/model/history_transaksi_model.dart';
+import 'package:app_petty_cash/widget/homepage_row_transaksi.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../../app/constant.dart';
+import '../../app/route.dart';
+import '../../provider/current_user_provider.dart';
+import '../../widget/custom_drawer.dart';
+
+class HomePageScreen extends HookConsumerWidget {
+  const HomePageScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final listSearchHistory = useState<List<HistoryTransaksiModel>>(
+      List.empty(
+        growable: true,
+      ),
+    );
+
+    useEffect(() {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
+        final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
+        if (userID == "0") {
+          //not login
+          Navigator.of(context)
+              .pushNamedAndRemoveUntil(loginRoute, (route) => true);
+
+          //  Navigator.popAndPushNamed(context, loginRoute);
+          return;
+        }
+      });
+      return () {};
+    }, []);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          'Home Screen',
+          style: TextStyle(color: Constant.textWhite),
+        ),
+        backgroundColor: Constant.pcBtnBackgroundColor,
+        iconTheme: IconThemeData(
+          color: Constant.textWhite,
+        ),
+      ),
+      drawer: CustomDrawer(),
+      body: SafeArea(
+        child: Padding(
+          padding: EdgeInsets.only(
+            top: Constant.getActualYPhone(context: context, y: 36),
+            left: Constant.getActualXPhone(context: context, x: 34),
+            right: Constant.getActualXPhone(context: context, x: 34),
+          ),
+          child: Container(
+            width: Constant.getActualXPhone(context: context, x: 390),
+            height: Constant.getActualYPhone(context: context, y: 844),
+            child: Column(
+              children: [
+                Container(
+                  width: Constant.getActualXPhone(context: context, x: 332),
+                  height: Constant.getActualYPhone(context: context, y: 173),
+                  decoration: BoxDecoration(
+                    // color: Colors.black12,
+                    borderRadius: BorderRadius.circular(20),
+                    image: DecorationImage(
+                      image: AssetImage('images/background_card.png'),
+                      fit: BoxFit.cover,
+                    ),
+                    boxShadow: [
+                      BoxShadow(
+                        color: Color.fromRGBO(145, 158, 171, 0.16),
+                        offset: Offset(0, 24),
+                        blurRadius: 48,
+                      ),
+                    ],
+                  ),
+                  //Isi Card
+                  child: Container(
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        // Text1 & Text2
+                        Padding(
+                          padding: EdgeInsets.only(
+                            top: Constant.getActualYPhone(
+                                context: context, y: 17),
+                            left: Constant.getActualXPhone(
+                                context: context, x: 81),
+                            right: Constant.getActualXPhone(
+                                context: context, x: 81),
+                          ),
+                          child: Container(
+                              child: Column(
+                            children: [
+                              Text(
+                                'Account Balance',
+                                style: Constant.body1(context: context)
+                                    .copyWith(
+                                        fontWeight: FontWeight.w400,
+                                        color: Constant.textWhite),
+                              ),
+                              Text(
+                                'Rp. 1,440,000',
+                                style: Constant.H4_700V2(context: context)
+                                    .copyWith(
+                                        fontSize: Constant.getActualYPhone(
+                                            context: context, y: 24),
+                                        fontWeight: FontWeight.w600,
+                                        color: Constant.textWhite),
+                              ),
+                            ],
+                          )),
+                        ),
+    
+                        SizedBox(
+                          height: Constant.getActualYPhone(
+                              context: context, y: 27),
+                        ),
+    
+                        //Debit dan Kredit
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment
+                              .center, // Menengahkan secara horizontal
+                          children: [
+                            // Spasi di sebelah kiri "Check In"
+                            Padding(
+                              padding: EdgeInsets.only(
+                                left: Constant.getActualXPhone(
+                                    context: context, x: 20),
+                              ),
+                              child: Container(
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      'Debit',
+                                      style: Constant.body1(context: context)
+                                          .copyWith(
+                                              fontWeight: FontWeight.w400,
+                                              color: Constant.textWhite),
+                                    ),
+                                    Text(
+                                      'Rp. 2,000,000',
+                                      style: Constant.titleH6_700(
+                                              context: context)
+                                          .copyWith(
+                                              color: Constant.textWhite),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+    
+                            SizedBox(
+                              width: Constant.getActualXPhone(
+                                  context: context, x: 51),
+                            ),
+    
+                            Padding(
+                              padding: EdgeInsets.only(
+                                right: Constant.getActualXPhone(
+                                    context: context, x: 28),
+                              ),
+                              child: Container(
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      'Credit',
+                                      style: Constant.body1(context: context)
+                                          .copyWith(
+                                              fontWeight: FontWeight.w400,
+                                              color: Constant.textWhite),
+                                    ),
+                                    Text(
+                                      'Rp. 560,000',
+                                      style: Constant.titleH6_700(
+                                              context: context)
+                                          .copyWith(
+                                              color: Constant.textWhite),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        SizedBox(
+                          height: Constant.getActualYPhone(
+                              context: context, y: 17),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                //Card
+                SizedBox(
+                  height: Constant.getActualYPhone(context: context, y: 36),
+                ),
+    
+                SizedBox(
+                  height: Constant.getActualYPhone(context: context, y: 44),
+                ),
+    
+                Padding(
+                  padding: EdgeInsets.only(
+                    left: Constant.getActualXPhone(context: context, x: 20),
+                    right: Constant.getActualXPhone(context: context, x: 20),
+                  ),
+                  child: Container(
+                    // color: Colors.amber,
+                    alignment: Alignment.centerLeft,
+    
+                    child: Column(children: [
+                      Text(
+                        'Transaksi Terkini',
+                        style: Constant.titleH5_600(context: context)
+                            .copyWith(color: Constant.textBlack),
+                      ),
+                      SizedBox(
+                        height:
+                            Constant.getActualYPhone(context: context, y: 24),
+                      ),
+                      // Expanded(
+                      //   child: ListView.builder(
+                      //     itemCount: listSearchHistory.value.length,
+                      //     itemBuilder: (context, idx) {
+                      //       return Padding(
+                      //         padding: EdgeInsets.only(
+                      //           bottom: Constant.getActualYPhone(
+                      //             context: context,
+                      //             y: 10,
+                      //           ),
+                      //         ),
+                      //         child: Card(
+                      //           elevation: 2.0,
+                      //           child: Padding(
+                      //             padding: EdgeInsets.all(10),
+                      //             child: Column(
+                      //               // crossAxisAlignment: CrossAxisAlignment.start,
+                      //               // mainAxisAlignment: MainAxisAlignment.start,
+                      //               children: [
+                      //                 // atas
+                      //                 HomepageRowTransaksiWidget(
+                      //                   icon_category_id: listSearchHistory
+                      //                       .value[idx].kategoriid
+                      //                       .toString(),
+                      //                   icon_category_name: listSearchHistory
+                      //                       .value[idx].kategoriname
+                      //                       .toString(),
+                      //                   amount: listSearchHistory
+                      //                       .value[idx].amount
+                      //                       .toString(),
+                      //                   tglTransaksi: listSearchHistory
+                      //                       .value[idx].tanggaltransaksi
+                      //                       .toString(),
+                      //                   tipe: listSearchHistory.value[idx].tipe
+                      //                       .toString(),
+                      //                 ),
+                      //               ],
+                      //             ),
+                      //           ),
+                      //         ),
+                      //       );
+                      //     },
+                      //   ),
+                      // ),
+                    ]),
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

app_petty_cash/lib/screen/transaksi/delete_transaksi_provider.dart

@@ -1,84 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import '../../repository/transaksi_repository.dart';
-import '../../provider/dio_provider.dart';
-import '../../repository/base_repository.dart';
-import 'search_history_transaksi_provider.dart';
-
-abstract class DeleteTransaksiState extends Equatable {
-  final DateTime date;
-  const DeleteTransaksiState(this.date);
-  @override
-  List<Object?> get props => [date];
-}
-
-class DeleteTransaksiStateInit extends DeleteTransaksiState {
-  DeleteTransaksiStateInit() : super(DateTime.now());
-}
-
-class DeleteTransaksiStateLoading extends DeleteTransaksiState {
-  DeleteTransaksiStateLoading() : super(DateTime.now());
-}
-
-class DeleteTransaksiStateError extends DeleteTransaksiState {
-  final String message;
-  DeleteTransaksiStateError({
-    required this.message,
-  }) : super(DateTime.now());
-}
-
-class DeleteTransaksiStateDone extends DeleteTransaksiState {
-  // final List<ListType> model;
-  final String resp;
-  DeleteTransaksiStateDone({
-    required this.resp,
-  }) : super(DateTime.now());
-}
-
-//notifier
-class DeleteTransaksiNotifier extends StateNotifier<DeleteTransaksiState> {
-  final Ref ref;
-  DeleteTransaksiNotifier({
-    required this.ref,
-  }) : super(DeleteTransaksiStateInit());
-
-  void deleteTransaksi(
-    String id,
-    String userid,
-    String companyid,
-    String tglAwal,
-    String tglAkhir,
-    String categoryid,
-  ) async {
-    try {
-      state = DeleteTransaksiStateLoading();
-      final dio = ref.read(dioProvider);
-      final resp = await TransaksiRepository(dio: dio).deleteTransaksi(
-        id,
-        userid,
-      );
-      state = DeleteTransaksiStateDone(resp: resp);
-
-      // search lagi buat get data
-      ref.read(searchHistoryTransaksiProvider.notifier).searchHistoryTransaksi(
-            companyid,
-            tglAwal,
-            tglAkhir,
-            categoryid,
-          );
-    } catch (e) {
-      if (e is BaseRepositoryException) {
-        state = DeleteTransaksiStateError(message: e.message.toString());
-      } else {
-        state = DeleteTransaksiStateError(message: e.toString());
-      }
-    }
-  }
-}
-
-//provider
-final deleteTransaksiProvider =
-    StateNotifierProvider<DeleteTransaksiNotifier, DeleteTransaksiState>(
-  (ref) => DeleteTransaksiNotifier(ref: ref),
-);

app_petty_cash/lib/screen/transaksi/history_transaksi_screen.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:app_petty_cash/screen/transaksi/delete_transaksi_provider.dart';
 import 'package:app_petty_cash/screen/transaksi/search_history_transaksi_provider.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
@@ -42,8 +41,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
       ),
     );
 
-    // String M_CompanyID = "0";
+    String M_CompanyID = "0";
-    final M_CompanyID = useState<String>("0");
     String formattedDate = DateFormat('dd-MM-yyyy').format(DateTime.now());
     final ctrlTglAwal = useTextEditingController(text: formattedDate);
 
@@ -140,27 +138,6 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
       },
     );
 
-    // delete transaksi
-    ref.listen(
-      deleteTransaksiProvider,
-      (previous, next) {
-        if (next is DeleteTransaksiStateLoading) {
-          searchHistoryIsLoading.value = true;
-        } else if (next is DeleteTransaksiStateError) {
-          // print(next.message);
-          searchHistoryIsLoading.value = false;
-          SanckbarWidget(context, next.message, snackbarType.error);
-        } else if (next is DeleteTransaksiStateDone) {
-          // print(jsonEncode(next.model));
-          // print(next.model.length);
-          // listSearchHistory.value = next.model;
-          SanckbarWidget(
-              context, 'Data Berhasil Dihapus', snackbarType.success);
-          searchHistoryIsLoading.value = false;
-        }
-      },
-    );
-
     Future<String> getCompanyID() async {
       final shared = await SharedPreferences.getInstance();
       String M_CompanyID = "0";
@@ -203,7 +180,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
         // list category provider
         ref.read(listCategoryProvider.notifier).getListCategory();
 
-        M_CompanyID.value = await getCompanyID();
+        M_CompanyID = await getCompanyID();
 
         DateTime parsedDate = DateFormat('dd-MM-yyyy').parse(
           ctrlTglAwal.value.text.toString(),
@@ -222,100 +199,11 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
         ref
             .read(searchHistoryTransaksiProvider.notifier)
             .searchHistoryTransaksi(
-              M_CompanyID.value,
+                M_CompanyID, formattedDateAwal, formattedDateAkhir, categoryid);
-              formattedDateAwal,
-              formattedDateAkhir,
-              categoryid,
-            );
       });
       return () {};
     }, []);
 
-    // delete alert
-    Future<void> showDeleteConfirmationDialog(
-      BuildContext context,
-      String id,
-      String userid,
-      String companyid,
-      String tglAwal,
-      String tglAkhir,
-      String categoryid,
-    ) async {
-      return showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: Text('Konfirmasi Hapus'),
-            content: Text('Apakah anda yakin menghapus data ini?'),
-            actions: <Widget>[
-              TextButton(
-                onPressed: () {
-                  Navigator.of(context).pop(); // Tutup dialog
-                },
-                child: Text('Batal'),
-              ),
-              ElevatedButton(
-                onPressed: () {
-                  print('Deleted id $id , userid $userid');
-                  DateTime parsedDate = DateFormat('dd-MM-yyyy').parse(
-                    ctrlTglAwal.value.text.toString(),
-                  );
-                  String formattedDateAwal =
-                      DateFormat('yyyy-MM-dd').format(parsedDate);
-
-                  DateTime parsedDateAkhir = DateFormat('dd-MM-yyyy').parse(
-                    ctrlTglAkhir.value.text.toString(),
-                  );
-                  String formattedDateAkhir =
-                      DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
-                  ref.read(deleteTransaksiProvider.notifier).deleteTransaksi(
-                        id,
-                        userid,
-                        companyid,
-                        formattedDateAwal,
-                        formattedDateAkhir,
-                        categoryid,
-                      );
-                  Navigator.of(context).pop();
-                },
-                child: Text(
-                  'Hapus Data',
-                  style: Constant.body1_600(context: context).copyWith(
-                    fontWeight: FontWeight.w600,
-                    color: Constant.textWhite,
-                  ),
-                ),
-                style: ButtonStyle(
-                  backgroundColor:
-                      MaterialStateColor.resolveWith((st) => Constant.textRed),
-                  shape: MaterialStateProperty.all<RoundedRectangleBorder>(
-                    RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(8),
-                      side: BorderSide(
-                        color: Constant.textRed,
-                      ),
-                    ),
-                  ),
-                  shadowColor: MaterialStateProperty.all(Color(0xffff48423d)),
-                  elevation: MaterialStateProperty.all(4.0),
-                ),
-              ),
-            ],
-          );
-        },
-      );
-    }
-
-    void _closeKeyboard() {
-      FocusManager.instance.primaryFocus?.unfocus();
-    }
-
-    final FocusNode focusNodetglAwal = useFocusNode();
-    final tglAwalHasFocus = useState(false);
-
-    final FocusNode focusNodetglAkhir = useFocusNode();
-    final tglAkhirHasFocus = useState(false);
-
     return Padding(
       padding: EdgeInsets.only(
         top: Constant.getActualYPhone(context: context, y: 30),
@@ -350,14 +238,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                     children: [
                       // Tanggal Awal
                       Expanded(
-                        child: GestureDetector(
-                          onTap: () {
-                            focusNodetglAwal.unfocus();
-                            // _closeKeyboard();
-                          },
                         child: TextField(
-                            enableInteractiveSelection: false,
-                            showCursor: (tglAwalHasFocus.value) ? true : false,
                           controller: ctrlTglAwal,
                           decoration: InputDecoration(
                             hintStyle:
@@ -430,13 +311,9 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                               print('cancel button');
                               return;
                             }
-
-                              // focusNodetglAwal.unfocus();
-                              // _closeKeyboard();
                           },
                         ),
                       ),
-                      ),
 
                       SizedBox(
                         width:
@@ -444,14 +321,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                       ),
                       // Tanggal Akhir
                       Expanded(
-                        child: GestureDetector(
-                          onTap: () {
-                            focusNodetglAkhir.unfocus();
-                            // _closeKeyboard();
-                          },
                         child: TextField(
-                            enableInteractiveSelection: false,
-                            showCursor: (tglAwalHasFocus.value) ? true : false,
                           controller: ctrlTglAkhir,
                           decoration: InputDecoration(
                             hintStyle:
@@ -517,8 +387,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                               //     selectedDateAkhir.toString().split(' ')[0];
                               ctrlTglAkhir.text = formattedDate;
                               tglAkhir.value = selectedDateAkhir;
-                                tglAkhirTmp.value =
+                              tglAkhirTmp.value = selectedDateAkhir.toString();
-                                    selectedDateAkhir.toString();
                             }
 
                             if (selectedDateAkhir == null) {
@@ -528,7 +397,6 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                           },
                         ),
                       ),
-                      ),
                     ],
                   ),
                   SizedBox(
@@ -720,11 +588,11 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                           ],
                         ),
                         onPressed: () async {
-                          M_CompanyID.value = await getCompanyID();
+                          M_CompanyID = await getCompanyID();
                           ref
                               .read(searchHistoryTransaksiProvider.notifier)
                               .searchHistoryTransaksi(
-                                M_CompanyID.value,
+                                M_CompanyID,
                                 ctrlTglAwal.text,
                                 ctrlTglAkhir.text,
                                 selectedListCategory.value.categoryid ?? "0",
@@ -886,7 +754,6 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                           tipe: listSearchHistory
                                               .value[idx].tipe
                                               .toString(),
-                                          // searchHistoryIsLoading.value
                                         ),
 
                                         // bawah
@@ -907,15 +774,15 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                                 ),
                                                 shape: RoundedRectangleBorder(
                                                   side: BorderSide(
-                                                      color: Constant
+                                                      color:
-                                                          .bgTextChipConfirmed),
+                                                          Constant.bgChipConfirmed),
                                                   borderRadius:
                                                       BorderRadius.circular(
                                                     50,
                                                   ),
                                                 ),
-                                                backgroundColor: Constant
+                                                backgroundColor:
-                                                    .bgTextChipConfirmed,
+                                                    Constant.bgChipConfirmed,
                                               ),
                                             ],
                                           ),
@@ -932,28 +799,8 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                                 MainAxisAlignment.end,
                                             children: [
                                               InkWell(
-                                                onTap: () async {
+                                                onTap: () {
-                                                  final userID = ref
+                                                  print('Deleted');
-                                                          .read(
-                                                              currentUserProvider)
-                                                          ?.model
-                                                          .M_UserID ??
-                                                      "0";
-                                                  // print('Deleted');
-                                                  showDeleteConfirmationDialog(
-                                                    context,
-                                                    listSearchHistory
-                                                        .value[idx].id
-                                                        .toString(),
-                                                    userID,
-                                                    M_CompanyID.value,
-                                                    ctrlTglAwal.text.toString(),
-                                                    ctrlTglAkhir.text
-                                                        .toString(),
-                                                    selectedListCategory
-                                                        .value.categoryid
-                                                        .toString(),
-                                                  );
                                                 },
                                                 child: Chip(
                                                   label: Text(
@@ -964,8 +811,8 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
                                                   ),
                                                   shape: RoundedRectangleBorder(
                                                     side: BorderSide(
-                                                        color: Constant
+                                                        color:
-                                                            .bgTextChipDelete),
+                                                            Constant.bgTextChipDelete),
                                                     borderRadius:
                                                         BorderRadius.circular(
                                                       50,

app_petty_cash/lib/widget/history_row_atas_widget.dart

@@ -3,7 +3,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:intl/intl.dart';
 
 import '../app/constant.dart';
 
@@ -13,7 +12,6 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
   final String amount;
   final String tipe;
   final String tglTransaksi;
-  // final ValueNotifier<bool> searchHistoryIsLoading;
 
   const HistoryRowAtasWidget({
     Key? key,
@@ -22,11 +20,11 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
     required this.amount,
     required this.tipe,
     required this.tglTransaksi,
-    // required this.searchHistoryIsLoading,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+
     // check file exist
     Future<Widget> checkFileExistence(String fileUrl) async {
       try {
@@ -64,24 +62,6 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
       }
     }
 
-    // fungsi tanggal
-    String formatDateString(String inputDate) {
-      try {
-        // Parsing tanggal dari string input
-        DateTime date = DateFormat('dd-MM-yyyy').parse(inputDate);
-
-        // Format tanggal ke '30 Des 2023'
-        String formattedDate = DateFormat('dd MMM yyyy', 'id').format(date);
-
-        return formattedDate;
-      } catch (e) {
-        // Tangkap kesalahan jika format tanggal tidak sesuai
-        print('Error parsing date: $e');
-        // return 'Format Tanggal Salah';
-        return inputDate;
-      }
-    }
-
     return Row(
       children: [
         // kiri
@@ -96,8 +76,7 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
           ),
           // child: Text('s'),
           child: FutureBuilder<Widget>(
-            future: checkFileExistence(
+            future: checkFileExistence('https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg'),
-                'https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg'),
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.waiting) {
                 return CircularProgressIndicator();
@@ -107,7 +86,8 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
                   color: Colors.red,
                 );
               } else {
-                return snapshot.data ?? Container();
+                return snapshot.data ??
+                    Container();
               }
             },
           ),
@@ -183,7 +163,7 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
                   ),
                 ),
                 Text(
-                  formatDateString(tglTransaksi),
+                  tglTransaksi,
                   style: Constant.body1_600(context: context).copyWith(
                       fontWeight: FontWeight.w600, color: Constant.textGreyv2),
                 ),

app_petty_cash/lib/widget/homepage_row_transaksi.dart

@@ -0,0 +1,177 @@
+import 'package:app_petty_cash/widget/sankbar_widget.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+import '../app/constant.dart';
+
+class HomepageRowTransaksiWidget extends HookConsumerWidget {
+  final String icon_category_id;
+  final String icon_category_name;
+  final String amount;
+  final String tipe;
+  final String tglTransaksi;
+
+  const HomepageRowTransaksiWidget({
+    Key? key,
+    required this.icon_category_id,
+    required this.icon_category_name,
+    required this.amount,
+    required this.tipe,
+    required this.tglTransaksi,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+
+    // check file exist
+    Future<Widget> checkFileExistence(String fileUrl) async {
+      try {
+        final dio = Dio();
+        final response = await dio.head(fileUrl);
+        if (response.statusCode == 200) {
+          return SvgPicture.network(
+            fileUrl,
+            semanticsLabel: 'Icon pizza',
+            placeholderBuilder: (BuildContext context) => Container(
+              padding: const EdgeInsets.all(30.0),
+              child: const CircularProgressIndicator(),
+            ),
+          );
+        } else {
+          return SvgPicture.network(
+            'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg',
+            semanticsLabel: 'Icon pizza',
+            placeholderBuilder: (BuildContext context) => Container(
+              padding: const EdgeInsets.all(30.0),
+              child: const CircularProgressIndicator(),
+            ),
+          );
+        }
+      } catch (e) {
+        // print('Error checking file existence: $e');
+        return SvgPicture.network(
+          'https://devone.aplikasi.web.id/pettycash-media/icon/icon_13.svg',
+          semanticsLabel: 'Icon pizza',
+          placeholderBuilder: (BuildContext context) => Container(
+            padding: const EdgeInsets.all(30.0),
+            child: const CircularProgressIndicator(),
+          ),
+        );
+      }
+    }
+
+    return Row(
+      children: [
+        // kiri
+        Container(
+          width: Constant.getActualXPhone(context: context, x: 38),
+          height: Constant.getActualYPhone(context: context, y: 38),
+          decoration: BoxDecoration(
+            color: Color.fromRGBO(241, 90, 41, 0.08),
+            borderRadius: BorderRadius.all(
+              Radius.circular(8.0),
+            ),
+          ),
+          // child: Text('s'),
+          child: FutureBuilder<Widget>(
+            future: checkFileExistence('https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg'),
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.waiting) {
+                return CircularProgressIndicator();
+              } else if (snapshot.hasError) {
+                return Icon(
+                  Icons.error,
+                  color: Colors.red,
+                );
+              } else {
+                return snapshot.data ??
+                    Container();
+              }
+            },
+          ),
+        ),
+
+        // tengah
+        Expanded(
+          child: Padding(
+            padding: EdgeInsets.only(
+              left: Constant.getActualYPhone(context: context, y: 20),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                Text(
+                  icon_category_name,
+                  style: Constant.body2_600(context: context).copyWith(
+                    fontWeight: FontWeight.w600,
+                    color: Constant.textBlack,
+                  ),
+                ),
+                SizedBox(
+                  height: Constant.getActualYPhone(
+                    context: context,
+                    y: 8,
+                  ),
+                ),
+                Text(
+                  amount,
+                  style: Constant.body1_600(context: context).copyWith(
+                      fontWeight: FontWeight.w600,
+                      color: Constant.pcBtnBackgroundColor),
+                ),
+              ],
+            ),
+          ),
+        ),
+
+        // kanan
+        Expanded(
+          child: Padding(
+            padding: EdgeInsets.only(
+              right: Constant.getActualYPhone(context: context, y: 8),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                Container(
+                  // width: Constant.getActualXPhone(context: context, x: 32),
+                  height: Constant.getActualYPhone(context: context, y: 19),
+                  decoration: BoxDecoration(
+                    color: Constant.bgIconHistory,
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(6.0),
+                    ),
+                  ),
+                  child: Padding(
+                    padding: EdgeInsets.all(2.0),
+                    child: Text(
+                      tipe,
+                      style: Constant.body1_600(context: context).copyWith(
+                          fontWeight: FontWeight.w600,
+                          color: Constant.pcBtnBackgroundColor),
+                    ),
+                  ),
+                ),
+                SizedBox(
+                  height: Constant.getActualYPhone(
+                    context: context,
+                    y: 8,
+                  ),
+                ),
+                Text(
+                  tglTransaksi,
+                  style: Constant.body1_600(context: context).copyWith(
+                      fontWeight: FontWeight.w600, color: Constant.textGreyv2),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

app_petty_cash/pubspec.lock

@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -240,14 +240,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -260,26 +252,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   open_file:
     dependency: "direct main"
     description:
@@ -465,18 +457,18 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   state_notifier:
     dependency: transitive
     description:
@@ -489,10 +481,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -513,10 +505,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.1"
   top_snackbar_flutter:
     dependency: "direct main"
     description:
@@ -629,6 +621,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   win32:
     dependency: transitive
     description:
@@ -654,5 +654,5 @@ packages:
     source: hosted
     version: "6.3.0"
 sdks:
-  dart: ">=3.0.6 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.10.0"