Merge branch 'main' into add_change_password
This commit is contained in:
@@ -13,7 +13,7 @@ class Constant {
|
|||||||
// static String version = "1.00";
|
// static String version = "1.00";
|
||||||
|
|
||||||
// NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
|
// NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
|
||||||
static String version = "1.0.0";
|
static String version = "1.1.0";
|
||||||
|
|
||||||
// static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";
|
// static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ class HistoryTransaksiModel {
|
|||||||
String? tanggalconfirm;
|
String? tanggalconfirm;
|
||||||
String? usertransaksi;
|
String? usertransaksi;
|
||||||
String? userconfirm;
|
String? userconfirm;
|
||||||
|
String? tanggalcreated;
|
||||||
|
|
||||||
HistoryTransaksiModel(
|
HistoryTransaksiModel(
|
||||||
{this.id,
|
{this.id,
|
||||||
@@ -26,7 +27,9 @@ class HistoryTransaksiModel {
|
|||||||
this.isconfirm,
|
this.isconfirm,
|
||||||
this.tanggalconfirm,
|
this.tanggalconfirm,
|
||||||
this.usertransaksi,
|
this.usertransaksi,
|
||||||
this.userconfirm});
|
this.userconfirm,
|
||||||
|
this.tanggalcreated
|
||||||
|
});
|
||||||
|
|
||||||
HistoryTransaksiModel.fromJson(Map<String, dynamic> json) {
|
HistoryTransaksiModel.fromJson(Map<String, dynamic> json) {
|
||||||
id = json['id'];
|
id = json['id'];
|
||||||
@@ -42,6 +45,7 @@ class HistoryTransaksiModel {
|
|||||||
tanggalconfirm = json['tanggalconfirm'];
|
tanggalconfirm = json['tanggalconfirm'];
|
||||||
usertransaksi = json['usertransaksi'];
|
usertransaksi = json['usertransaksi'];
|
||||||
userconfirm = json['userconfirm'];
|
userconfirm = json['userconfirm'];
|
||||||
|
tanggalcreated = json['tanggalcreated'];
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
@@ -59,6 +63,7 @@ class HistoryTransaksiModel {
|
|||||||
data['tanggalconfirm'] = this.tanggalconfirm;
|
data['tanggalconfirm'] = this.tanggalconfirm;
|
||||||
data['usertransaksi'] = this.usertransaksi;
|
data['usertransaksi'] = this.usertransaksi;
|
||||||
data['userconfirm'] = this.userconfirm;
|
data['userconfirm'] = this.userconfirm;
|
||||||
|
data['tanggalcreated'] = this.tanggalcreated;
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -12,21 +12,24 @@ class ListTransaksiHomeModel {
|
|||||||
String? tanggalconfirm;
|
String? tanggalconfirm;
|
||||||
String? usertransaksi;
|
String? usertransaksi;
|
||||||
String? userconfirm;
|
String? userconfirm;
|
||||||
|
String? tanggalcreated;
|
||||||
|
|
||||||
ListTransaksiHomeModel(
|
ListTransaksiHomeModel({
|
||||||
{this.id,
|
this.id,
|
||||||
this.tanggaltransaksi,
|
this.tanggaltransaksi,
|
||||||
this.tipe,
|
this.tipe,
|
||||||
this.kategoriid,
|
this.kategoriid,
|
||||||
this.kategoriname,
|
this.kategoriname,
|
||||||
this.note,
|
this.note,
|
||||||
this.amount,
|
this.amount,
|
||||||
this.sender,
|
this.sender,
|
||||||
this.imgurl,
|
this.imgurl,
|
||||||
this.isconfirm,
|
this.isconfirm,
|
||||||
this.tanggalconfirm,
|
this.tanggalconfirm,
|
||||||
this.usertransaksi,
|
this.usertransaksi,
|
||||||
this.userconfirm});
|
this.userconfirm,
|
||||||
|
this.tanggalcreated,
|
||||||
|
});
|
||||||
|
|
||||||
ListTransaksiHomeModel.fromJson(Map<String, dynamic> json) {
|
ListTransaksiHomeModel.fromJson(Map<String, dynamic> json) {
|
||||||
id = json['id'];
|
id = json['id'];
|
||||||
@@ -42,6 +45,7 @@ class ListTransaksiHomeModel {
|
|||||||
tanggalconfirm = json['tanggalconfirm'];
|
tanggalconfirm = json['tanggalconfirm'];
|
||||||
usertransaksi = json['usertransaksi'];
|
usertransaksi = json['usertransaksi'];
|
||||||
userconfirm = json['userconfirm'];
|
userconfirm = json['userconfirm'];
|
||||||
|
tanggalcreated = json['tanggalcreated'];
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
@@ -59,6 +63,7 @@ class ListTransaksiHomeModel {
|
|||||||
data['tanggalconfirm'] = this.tanggalconfirm;
|
data['tanggalconfirm'] = this.tanggalconfirm;
|
||||||
data['usertransaksi'] = this.usertransaksi;
|
data['usertransaksi'] = this.usertransaksi;
|
||||||
data['userconfirm'] = this.userconfirm;
|
data['userconfirm'] = this.userconfirm;
|
||||||
|
data['tanggalcreated'] = this.tanggalcreated;
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ class TransaksiRepository extends BaseRepository {
|
|||||||
String categoryid,
|
String categoryid,
|
||||||
) async {
|
) async {
|
||||||
final service =
|
final service =
|
||||||
"${Constant.baseUrlDevone}/homescreen/list_transaction/?companyid=$companyid&startdate=$tglAwal&enddate=$tglAkhir&kategoriid=$categoryid";
|
"${Constant.baseUrlDevone}/history/list_transaction/?companyid=$companyid&startdate=$tglAwal&enddate=$tglAkhir&kategoriid=$categoryid";
|
||||||
// https://devone.aplikasi.web.id/one-api-pettycash/pettycash/history/list_transaction/?companyid=1&startdate=2023-12-01&enddate=2023-12-30&kategoriid=0
|
// https://devone.aplikasi.web.id/one-api-pettycash/pettycash/history/list_transaction/?companyid=1&startdate=2023-12-01&enddate=2023-12-30&kategoriid=0
|
||||||
final resp = await get(
|
final resp = await get(
|
||||||
// param: {
|
// param: {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:app_petty_cash/screen/home/list_transaksi_home_provider.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
import '../../app/constant.dart';
|
import '../../app/constant.dart';
|
||||||
@@ -140,6 +141,25 @@ class HomeScreen extends HookConsumerWidget {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
String formatDateString(String inputDate) {
|
||||||
|
try {
|
||||||
|
// Parsing tanggal dari string input
|
||||||
|
DateTime date =
|
||||||
|
DateFormat('dd-MM-yyyy HH:mm:ss', 'id').parse(inputDate);
|
||||||
|
|
||||||
|
// Format tanggal ke '30 Des 2023'
|
||||||
|
String formattedDate =
|
||||||
|
DateFormat('dd MMM yyyy HH:mm:ss', '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 Padding(
|
return Padding(
|
||||||
padding: EdgeInsets.only(
|
padding: EdgeInsets.only(
|
||||||
top: Constant.getActualYPhone(context: context, y: 30),
|
top: Constant.getActualYPhone(context: context, y: 30),
|
||||||
@@ -400,6 +420,60 @@ class HomeScreen extends HookConsumerWidget {
|
|||||||
.value[idx].tipe
|
.value[idx].tipe
|
||||||
.toString(),
|
.toString(),
|
||||||
),
|
),
|
||||||
|
|
||||||
|
SizedBox(
|
||||||
|
height: Constant.getActualYPhone(
|
||||||
|
context: context, y: 10),
|
||||||
|
),
|
||||||
|
|
||||||
|
// catatan
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: Text(
|
||||||
|
listTransaksiHome.value[idx].note
|
||||||
|
.toString(),
|
||||||
|
style: Constant.body1(
|
||||||
|
context: context)
|
||||||
|
.copyWith(
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Constant.textBlack,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
SizedBox(
|
||||||
|
height: Constant.getActualYPhone(
|
||||||
|
context: context, y: 10),
|
||||||
|
),
|
||||||
|
|
||||||
|
// Tanggal Created align right
|
||||||
|
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment:
|
||||||
|
MainAxisAlignment.end,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'created : ' +
|
||||||
|
formatDateString(
|
||||||
|
listTransaksiHome
|
||||||
|
.value[idx]
|
||||||
|
.tanggalcreated
|
||||||
|
.toString(),
|
||||||
|
),
|
||||||
|
overflow:
|
||||||
|
TextOverflow.ellipsis,
|
||||||
|
style: Constant.body1(
|
||||||
|
context: context)
|
||||||
|
.copyWith(
|
||||||
|
fontWeight:
|
||||||
|
FontWeight.normal,
|
||||||
|
fontStyle: FontStyle.italic,
|
||||||
|
color: Constant.textBlack,
|
||||||
|
fontSize: 14,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -31,6 +31,10 @@ class ReportScreen extends HookConsumerWidget {
|
|||||||
final tglAkhirTmp = useState<String>("");
|
final tglAkhirTmp = useState<String>("");
|
||||||
String M_CompanyID = "0";
|
String M_CompanyID = "0";
|
||||||
|
|
||||||
|
String timeStamp = DateFormat('dd-MM-yyyy').format(
|
||||||
|
DateTime.now(),
|
||||||
|
);
|
||||||
|
|
||||||
Future<String> getCompanyID() async {
|
Future<String> getCompanyID() async {
|
||||||
final shared = await SharedPreferences.getInstance();
|
final shared = await SharedPreferences.getInstance();
|
||||||
String M_CompanyID = "0";
|
String M_CompanyID = "0";
|
||||||
@@ -328,8 +332,9 @@ class ReportScreen extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
M_CompanyID = await getCompanyID();
|
M_CompanyID = await getCompanyID();
|
||||||
if(M_CompanyID == "0"){
|
if (M_CompanyID == "0") {
|
||||||
SanckbarWidget(context, 'Invalid Company', snackbarType.error);
|
SanckbarWidget(
|
||||||
|
context, 'Invalid Company', snackbarType.error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Awal
|
// Awal
|
||||||
@@ -343,13 +348,13 @@ class ReportScreen extends HookConsumerWidget {
|
|||||||
// Akhir
|
// Akhir
|
||||||
DateTime parsedDateAkhir =
|
DateTime parsedDateAkhir =
|
||||||
DateFormat('dd-MM-yyyy').parse(
|
DateFormat('dd-MM-yyyy').parse(
|
||||||
ctrlTglAwal.value.text.toString(),
|
ctrlTglAkhir.value.text.toString(),
|
||||||
);
|
);
|
||||||
String formattedDateAkhir =
|
String formattedDateAkhir =
|
||||||
DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
|
DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
|
||||||
|
|
||||||
String url =
|
String url =
|
||||||
"https://${Constant.baseUrlDevoneReport}/birt/run?__report=report/one/pettycash/rpt_r_pt_001.rptdesign&__format=xls&PStartDate=$formattedDateAwal&PEndDate=$formattedDateAkhir&PCompanyID=$M_CompanyID&username=adminsas%20";
|
"https://${Constant.baseUrlDevoneReport}/birt/run?__report=report/one/pettycash/rpt_r_pt_001.rptdesign&__format=xls&PStartDate=$formattedDateAwal&PEndDate=$formattedDateAkhir&PCompanyID=$M_CompanyID&username=adminsas%20&tm=$timeStamp";
|
||||||
if (!await launchUrl(Uri.parse(url))) {
|
if (!await launchUrl(Uri.parse(url))) {
|
||||||
// throw Exception('Could not launch $url');
|
// throw Exception('Could not launch $url');
|
||||||
SanckbarWidget(context, 'Could not launch $url',
|
SanckbarWidget(context, 'Could not launch $url',
|
||||||
@@ -406,8 +411,9 @@ class ReportScreen extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
M_CompanyID = await getCompanyID();
|
M_CompanyID = await getCompanyID();
|
||||||
if(M_CompanyID == "0"){
|
if (M_CompanyID == "0") {
|
||||||
SanckbarWidget(context, 'Invalid Company', snackbarType.error);
|
SanckbarWidget(
|
||||||
|
context, 'Invalid Company', snackbarType.error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Awal
|
// Awal
|
||||||
@@ -421,13 +427,15 @@ class ReportScreen extends HookConsumerWidget {
|
|||||||
// Akhir
|
// Akhir
|
||||||
DateTime parsedDateAkhir =
|
DateTime parsedDateAkhir =
|
||||||
DateFormat('dd-MM-yyyy').parse(
|
DateFormat('dd-MM-yyyy').parse(
|
||||||
ctrlTglAwal.value.text.toString(),
|
ctrlTglAkhir.value.text.toString(),
|
||||||
);
|
);
|
||||||
String formattedDateAkhir =
|
String formattedDateAkhir =
|
||||||
DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
|
DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
|
||||||
|
|
||||||
String url =
|
String url =
|
||||||
"https://${Constant.baseUrlDevoneReport}/birt/run?__report=report/one/pettycash/rpt_r_pt_001.rptdesign&__format=pdf&PStartDate=$formattedDateAwal&PEndDate=$formattedDateAkhir&PCompanyID=$M_CompanyID&username=adminsas%20";
|
"https://${Constant.baseUrlDevoneReport}/birt/run?__report=report/one/pettycash/rpt_r_pt_001.rptdesign&__format=pdf&PStartDate=$formattedDateAwal&PEndDate=$formattedDateAkhir&PCompanyID=$M_CompanyID&username=adminsas%20&tm=$timeStamp";
|
||||||
|
|
||||||
|
print(url);
|
||||||
if (!await launchUrl(Uri.parse(url))) {
|
if (!await launchUrl(Uri.parse(url))) {
|
||||||
// throw Exception('Could not launch $url');
|
// throw Exception('Could not launch $url');
|
||||||
SanckbarWidget(context, 'Could not launch $url',
|
SanckbarWidget(context, 'Could not launch $url',
|
||||||
|
|||||||
@@ -464,6 +464,25 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
|||||||
final FocusNode focusNodetglAkhir = useFocusNode();
|
final FocusNode focusNodetglAkhir = useFocusNode();
|
||||||
final tglAkhirHasFocus = useState(false);
|
final tglAkhirHasFocus = useState(false);
|
||||||
|
|
||||||
|
String formatDateString(String inputDate) {
|
||||||
|
try {
|
||||||
|
// Parsing tanggal dari string input
|
||||||
|
DateTime date =
|
||||||
|
DateFormat('dd-MM-yyyy HH:mm:ss', 'id').parse(inputDate);
|
||||||
|
|
||||||
|
// Format tanggal ke '30 Des 2023'
|
||||||
|
String formattedDate =
|
||||||
|
DateFormat('dd MMM yyyy HH:mm:ss', '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 GestureDetector(
|
return GestureDetector(
|
||||||
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
|
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
|
||||||
child: Padding(
|
child: Padding(
|
||||||
@@ -736,6 +755,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
|||||||
value: option,
|
value: option,
|
||||||
child: Text(
|
child: Text(
|
||||||
option.categoryname ?? "",
|
option.categoryname ?? "",
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
style: Constant.body1(context: context)
|
style: Constant.body1(context: context)
|
||||||
.copyWith(
|
.copyWith(
|
||||||
color: Constant.textBlack,
|
color: Constant.textBlack,
|
||||||
@@ -875,13 +895,27 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
|
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);
|
||||||
|
|
||||||
M_CompanyID.value = await getCompanyID();
|
M_CompanyID.value = await getCompanyID();
|
||||||
ref
|
ref
|
||||||
.read(searchHistoryTransaksiProvider.notifier)
|
.read(searchHistoryTransaksiProvider.notifier)
|
||||||
.searchHistoryTransaksi(
|
.searchHistoryTransaksi(
|
||||||
M_CompanyID.value,
|
M_CompanyID.value,
|
||||||
ctrlTglAwal.text,
|
formattedDateAwal,
|
||||||
ctrlTglAkhir.text,
|
formattedDateAkhir,
|
||||||
selectedListCategory.value.categoryid ?? "0",
|
selectedListCategory.value.categoryid ?? "0",
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -1080,7 +1114,27 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
|||||||
// ),
|
// ),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: Constant.getActualYPhone(
|
height: Constant.getActualYPhone(
|
||||||
context: context, y: 6),
|
context: context, y: 10),
|
||||||
|
),
|
||||||
|
|
||||||
|
// catatan
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: Text(
|
||||||
|
listSearchHistory.value[idx].note
|
||||||
|
.toString(),
|
||||||
|
style: Constant.body1(
|
||||||
|
context: context)
|
||||||
|
.copyWith(
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Constant.textBlack,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
SizedBox(
|
||||||
|
height: Constant.getActualYPhone(
|
||||||
|
context: context, y: 10),
|
||||||
),
|
),
|
||||||
|
|
||||||
if (listSearchHistory
|
if (listSearchHistory
|
||||||
@@ -1308,70 +1362,32 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
// Row(
|
// Tanggal Created align right
|
||||||
// children: [
|
|
||||||
// Container(
|
Row(
|
||||||
// width: Constant.getActualXPhone(
|
mainAxisAlignment:
|
||||||
// context: context, x: 40),
|
MainAxisAlignment.end,
|
||||||
// height: Constant.getActualYPhone(
|
children: [
|
||||||
// context: context,
|
Text(
|
||||||
// y: 40,
|
'created : ' +
|
||||||
// ),
|
formatDateString(
|
||||||
// child: Image.asset(
|
listSearchHistory
|
||||||
// "images/icon_delete.png",
|
.value[idx]
|
||||||
// // scale: 1,
|
.tanggalcreated
|
||||||
// ),
|
.toString(),
|
||||||
// ),
|
),
|
||||||
// SizedBox(
|
overflow: TextOverflow.ellipsis,
|
||||||
// height: Constant.getActualYPhone(
|
style: Constant.body1(
|
||||||
// context: context, y: 12),
|
context: context)
|
||||||
// ),
|
.copyWith(
|
||||||
// Expanded(
|
fontWeight: FontWeight.normal,
|
||||||
// child: ElevatedButton(
|
fontStyle: FontStyle.italic,
|
||||||
// style: ButtonStyle(
|
color: Constant.textBlack,
|
||||||
// backgroundColor: MaterialStateColor
|
fontSize: 14,
|
||||||
// .resolveWith((st) => Constant
|
),
|
||||||
// .pcBtnBackgroundColor),
|
),
|
||||||
// shape:
|
],
|
||||||
// MaterialStateProperty.all<
|
),
|
||||||
// RoundedRectangleBorder>(
|
|
||||||
// RoundedRectangleBorder(
|
|
||||||
// borderRadius:
|
|
||||||
// BorderRadius.circular(
|
|
||||||
// 8),
|
|
||||||
// side: BorderSide(
|
|
||||||
// color: Constant
|
|
||||||
// .pcBtnBackgroundColor,
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
// shadowColor:
|
|
||||||
// MaterialStateProperty.all(
|
|
||||||
// Color(0xffff48423d)),
|
|
||||||
// elevation:
|
|
||||||
// MaterialStateProperty.all(
|
|
||||||
// 4.0),
|
|
||||||
// ),
|
|
||||||
// child: Stack(
|
|
||||||
// children: [
|
|
||||||
// Text(
|
|
||||||
// 'Confirmed',
|
|
||||||
// style: Constant.body1(
|
|
||||||
// context: context)
|
|
||||||
// .copyWith(
|
|
||||||
// fontWeight:
|
|
||||||
// FontWeight
|
|
||||||
// .w600,
|
|
||||||
// color: Constant
|
|
||||||
// .white),
|
|
||||||
// ),
|
|
||||||
// ],
|
|
||||||
// ),
|
|
||||||
// onPressed: () {},
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
// ],
|
|
||||||
// ),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ class TransaksiSelectKategoriWidget extends StatelessWidget {
|
|||||||
value: option,
|
value: option,
|
||||||
child: Text(
|
child: Text(
|
||||||
option.categoryname ?? "",
|
option.categoryname ?? "",
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
style: Constant.body1(context: context).copyWith(
|
style: Constant.body1(context: context).copyWith(
|
||||||
color: Constant.textBlack, fontWeight: FontWeight.w400),
|
color: Constant.textBlack, fontWeight: FontWeight.w400),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -211,71 +211,6 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
|
|||||||
Radius.circular(8.0),
|
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();
|
|
||||||
// // return Text('');
|
|
||||||
// // } else if (snapshot.hasError) {
|
|
||||||
// // return Icon(
|
|
||||||
// // Icons.error,
|
|
||||||
// // color: Colors.red,
|
|
||||||
// // );
|
|
||||||
// // } else {
|
|
||||||
// // return snapshot.data ?? Container();
|
|
||||||
// // }
|
|
||||||
|
|
||||||
// if (snapshot.connectionState == ConnectionState.done) {
|
|
||||||
// return snapshot.data ?? Container();
|
|
||||||
// } else if (snapshot.hasError) {
|
|
||||||
// return Icon(
|
|
||||||
// Icons.error,
|
|
||||||
// color: Colors.red,
|
|
||||||
// );
|
|
||||||
// } else {
|
|
||||||
// return Text('');
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// ),
|
|
||||||
// child: Consumer(
|
|
||||||
// builder: (context, watch, child) {
|
|
||||||
// String iconUrl =
|
|
||||||
// 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg';
|
|
||||||
// final iconAsyncValue = ref.read(
|
|
||||||
// iconProvider(
|
|
||||||
// iconUrl,
|
|
||||||
// ),
|
|
||||||
// );
|
|
||||||
|
|
||||||
// return iconAsyncValue.when(
|
|
||||||
// loading: () {
|
|
||||||
// print('loading iconurl : $iconUrl');
|
|
||||||
// return CircularProgressIndicator();
|
|
||||||
// },
|
|
||||||
// error: (error, stackTrace) {
|
|
||||||
// print('error iconurl : $iconUrl');
|
|
||||||
// return Icon(
|
|
||||||
// Icons.error,
|
|
||||||
// color: Colors.red,
|
|
||||||
// );
|
|
||||||
// },
|
|
||||||
// data: (iconWidget) {
|
|
||||||
// print('data iconurl : $iconUrl');
|
|
||||||
// return iconWidget ?? Container();
|
|
||||||
// }
|
|
||||||
// );
|
|
||||||
// },
|
|
||||||
// ),
|
|
||||||
|
|
||||||
// child: SvgPicture.network(
|
|
||||||
// 'https://devone.aplikasi.web.id/pettycash-media/icon/icon_$icon_category_id.svg',
|
|
||||||
// semanticsLabel: 'Icon pizza',
|
|
||||||
// ),
|
|
||||||
|
|
||||||
child: getIconUrl(icon_category_id),
|
child: getIconUrl(icon_category_id),
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|||||||
@@ -85,10 +85,10 @@ packages:
|
|||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: collection
|
name: collection
|
||||||
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
|
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.18.0"
|
version: "1.17.1"
|
||||||
convert:
|
convert:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -436,26 +436,26 @@ packages:
|
|||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: matcher
|
name: matcher
|
||||||
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
|
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.12.16"
|
version: "0.12.15"
|
||||||
material_color_utilities:
|
material_color_utilities:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: material_color_utilities
|
name: material_color_utilities
|
||||||
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
|
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.5.0"
|
version: "0.2.0"
|
||||||
meta:
|
meta:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: meta
|
name: meta
|
||||||
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
|
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.10.0"
|
version: "1.9.1"
|
||||||
mime:
|
mime:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -689,18 +689,18 @@ packages:
|
|||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: source_span
|
name: source_span
|
||||||
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
|
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.10.0"
|
version: "1.9.1"
|
||||||
stack_trace:
|
stack_trace:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: stack_trace
|
name: stack_trace
|
||||||
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
|
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.11.1"
|
version: "1.11.0"
|
||||||
state_notifier:
|
state_notifier:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -713,10 +713,10 @@ packages:
|
|||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: stream_channel
|
name: stream_channel
|
||||||
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
|
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.2"
|
version: "2.1.1"
|
||||||
string_scanner:
|
string_scanner:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -737,10 +737,10 @@ packages:
|
|||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: test_api
|
name: test_api
|
||||||
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
|
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.6.1"
|
version: "0.5.1"
|
||||||
top_snackbar_flutter:
|
top_snackbar_flutter:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -893,14 +893,6 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.17"
|
version: "2.0.17"
|
||||||
web:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: web
|
|
||||||
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "0.3.0"
|
|
||||||
win32:
|
win32:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -934,5 +926,5 @@ packages:
|
|||||||
source: hosted
|
source: hosted
|
||||||
version: "3.1.2"
|
version: "3.1.2"
|
||||||
sdks:
|
sdks:
|
||||||
dart: ">=3.2.0-194.0.dev <4.0.0"
|
dart: ">=3.0.6 <4.0.0"
|
||||||
flutter: ">=3.10.0"
|
flutter: ">=3.10.0"
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 1.0.0+1
|
version: 1.1.0
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.0.6 <4.0.0'
|
sdk: '>=3.0.6 <4.0.0'
|
||||||
|
|||||||
Reference in New Issue
Block a user