Compare commits
11 Commits
774d70884a
...
add_change
| Author | SHA1 | Date | |
|---|---|---|---|
|
d3e455c371 | ||
|
|
6b28794577 | ||
|
|
81733ec865 | ||
|
|
9d9db9eeb4 | ||
|
|
acc42c2d8f | ||
|
|
f03266674a | ||
|
c67f771d25 | ||
|
|
2cab59c86c | ||
|
|
c2f43f9061 | ||
|
|
60919d6d12 | ||
|
|
7986d68560 |
@@ -1,13 +1,14 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
<application
|
||||
android:label="PettyCash"
|
||||
android:name="${applicationName}"
|
||||
android:icon="@mipmap/launcher_icon"
|
||||
android:usesCleartextTraffic="true"
|
||||
android:requestLegacyExternalStorage="true"
|
||||
>
|
||||
>
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<external-path name="external_storage_directory" path="." />
|
||||
<external-path name="external_files" path="."/>
|
||||
</resources>
|
||||
@@ -13,7 +13,7 @@ class Constant {
|
||||
// static String version = "1.00";
|
||||
|
||||
// NOTE VERSI HARUS SAMA DENGAN PUBSPEC.YAML
|
||||
static String version = "1.0.0";
|
||||
static String version = "1.1.5";
|
||||
|
||||
// static String baseUrl = "https://devregonline.pramita.co.id/one-api/xdoc/";
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import 'package:app_petty_cash/screen/change_pasword/change_password_screen.dart';
|
||||
|
||||
import '../screen/change_company/change_company.dart';
|
||||
import 'package:app_petty_cash/screen/camera/coba_camera.dart';
|
||||
import 'package:app_petty_cash/screen/camera/example.dart';
|
||||
@@ -20,6 +22,7 @@ const transaksiRoute = "/transaksiRoute";
|
||||
const userRoute = "/userRoute";
|
||||
const reportRoute = "/reportRoute";
|
||||
const changeCompanyRoute = "/changeCompanyRoute";
|
||||
const changePasswordRoute = "/changePasswordRoute";
|
||||
const historyTransaksiRoute = "/historyTransaksiRoute";
|
||||
const cameraExampleRoute = "/cameraExampleRoute";
|
||||
const cobaCameraRoute = "/cobaCameraRoute";
|
||||
@@ -119,6 +122,18 @@ class AppRoute {
|
||||
);
|
||||
});
|
||||
}
|
||||
// transaksi screen
|
||||
if (settings.name == changePasswordRoute) {
|
||||
return MaterialPageRoute(builder: (context) {
|
||||
return MediaQuery(
|
||||
data: MediaQuery.of(context).copyWith(
|
||||
textScaleFactor: 1.0,
|
||||
padding: EdgeInsets.all(0),
|
||||
),
|
||||
child: ChangePasswordScreen(),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
// test file picker screen
|
||||
if (settings.name == testFilePickerRoute) {
|
||||
|
||||
21
app_petty_cash/lib/model/company_model.dart
Normal file
21
app_petty_cash/lib/model/company_model.dart
Normal file
@@ -0,0 +1,21 @@
|
||||
class CompanyModel {
|
||||
String? companyid;
|
||||
String? companyname;
|
||||
String? mUserDefaultCompany;
|
||||
|
||||
CompanyModel({this.companyid, this.companyname, this.mUserDefaultCompany});
|
||||
|
||||
CompanyModel.fromJson(Map<String, dynamic> json) {
|
||||
companyid = json['companyid'];
|
||||
companyname = json['companyname'];
|
||||
mUserDefaultCompany = json['M_UserDefaultCompany'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['companyid'] = this.companyid;
|
||||
data['companyname'] = this.companyname;
|
||||
data['M_UserDefaultCompany'] = this.mUserDefaultCompany;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@@ -12,6 +12,7 @@ class HistoryTransaksiModel {
|
||||
String? tanggalconfirm;
|
||||
String? usertransaksi;
|
||||
String? userconfirm;
|
||||
String? tanggalcreated;
|
||||
|
||||
HistoryTransaksiModel(
|
||||
{this.id,
|
||||
@@ -26,7 +27,9 @@ class HistoryTransaksiModel {
|
||||
this.isconfirm,
|
||||
this.tanggalconfirm,
|
||||
this.usertransaksi,
|
||||
this.userconfirm});
|
||||
this.userconfirm,
|
||||
this.tanggalcreated
|
||||
});
|
||||
|
||||
HistoryTransaksiModel.fromJson(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
@@ -42,6 +45,7 @@ class HistoryTransaksiModel {
|
||||
tanggalconfirm = json['tanggalconfirm'];
|
||||
usertransaksi = json['usertransaksi'];
|
||||
userconfirm = json['userconfirm'];
|
||||
tanggalcreated = json['tanggalcreated'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
@@ -59,6 +63,7 @@ class HistoryTransaksiModel {
|
||||
data['tanggalconfirm'] = this.tanggalconfirm;
|
||||
data['usertransaksi'] = this.usertransaksi;
|
||||
data['userconfirm'] = this.userconfirm;
|
||||
data['tanggalcreated'] = this.tanggalcreated;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@@ -12,21 +12,24 @@ class ListTransaksiHomeModel {
|
||||
String? tanggalconfirm;
|
||||
String? usertransaksi;
|
||||
String? userconfirm;
|
||||
String? tanggalcreated;
|
||||
|
||||
ListTransaksiHomeModel(
|
||||
{this.id,
|
||||
this.tanggaltransaksi,
|
||||
this.tipe,
|
||||
this.kategoriid,
|
||||
this.kategoriname,
|
||||
this.note,
|
||||
this.amount,
|
||||
this.sender,
|
||||
this.imgurl,
|
||||
this.isconfirm,
|
||||
this.tanggalconfirm,
|
||||
this.usertransaksi,
|
||||
this.userconfirm});
|
||||
ListTransaksiHomeModel({
|
||||
this.id,
|
||||
this.tanggaltransaksi,
|
||||
this.tipe,
|
||||
this.kategoriid,
|
||||
this.kategoriname,
|
||||
this.note,
|
||||
this.amount,
|
||||
this.sender,
|
||||
this.imgurl,
|
||||
this.isconfirm,
|
||||
this.tanggalconfirm,
|
||||
this.usertransaksi,
|
||||
this.userconfirm,
|
||||
this.tanggalcreated,
|
||||
});
|
||||
|
||||
ListTransaksiHomeModel.fromJson(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
@@ -42,6 +45,7 @@ class ListTransaksiHomeModel {
|
||||
tanggalconfirm = json['tanggalconfirm'];
|
||||
usertransaksi = json['usertransaksi'];
|
||||
userconfirm = json['userconfirm'];
|
||||
tanggalcreated = json['tanggalcreated'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
@@ -59,6 +63,7 @@ class ListTransaksiHomeModel {
|
||||
data['tanggalconfirm'] = this.tanggalconfirm;
|
||||
data['usertransaksi'] = this.usertransaksi;
|
||||
data['userconfirm'] = this.userconfirm;
|
||||
data['tanggalcreated'] = this.tanggalcreated;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,35 +59,26 @@ class AuthRepository extends BaseRepository {
|
||||
}
|
||||
}
|
||||
|
||||
Future<String> change_password({
|
||||
Future<String> changePassword({
|
||||
required String userID,
|
||||
required String token,
|
||||
required String M_UserID,
|
||||
required String username,
|
||||
required String doctor_id,
|
||||
required String new_password,
|
||||
required String confirm_password,
|
||||
required String tokenx,
|
||||
required String oldPassword,
|
||||
required String newPassword,
|
||||
required String confirmPassword,
|
||||
}) async {
|
||||
final param = {
|
||||
"tokenx": tokenx,
|
||||
"token": token,
|
||||
"M_UserID": M_UserID,
|
||||
"username": username,
|
||||
"doctor_id": doctor_id,
|
||||
"new_password": new_password,
|
||||
"confirm_password": confirm_password
|
||||
"M_UserID": userID,
|
||||
"old_password": oldPassword,
|
||||
"new_password": newPassword,
|
||||
"confirm_password": confirmPassword
|
||||
|
||||
// "username": "alhadad",
|
||||
// "doctor_id": "3101210841",
|
||||
// "password": "riau123"
|
||||
};
|
||||
|
||||
final service = "${Constant.baseUrlDevone}auth/change_password";
|
||||
final resp = await post(param: param, service: service);
|
||||
|
||||
// final result = AuthModel(
|
||||
// token: resp["data"]["token"],
|
||||
// model: AuthDoctorModel.fromJson(resp["data"]["user"]),
|
||||
// );
|
||||
// return result;
|
||||
final resp = await post(param: param, service: service, token: token);
|
||||
|
||||
if (resp["status"] == "OK") {
|
||||
return resp['message'];
|
||||
|
||||
32
app_petty_cash/lib/repository/company_repository.dart
Normal file
32
app_petty_cash/lib/repository/company_repository.dart
Normal file
@@ -0,0 +1,32 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:app_petty_cash/model/company_model.dart';
|
||||
import 'package:app_petty_cash/model/list_type_model.dart';
|
||||
|
||||
import '../app/constant.dart';
|
||||
import '../model/history_transaksi_model.dart';
|
||||
import '../model/list_category_model.dart';
|
||||
import 'base_repository.dart';
|
||||
|
||||
class CompanyRepository extends BaseRepository {
|
||||
CompanyRepository({required super.dio});
|
||||
|
||||
// list company
|
||||
Future<List<CompanyModel>> getListCompany({required String userID}) async {
|
||||
// https: //devone.aplikasi.web.id/one-api-pettycash/pettycash/Usercompany/list_company?M_UserID=2
|
||||
final service =
|
||||
"${Constant.baseUrlDevone}Usercompany/list_company?M_UserID=${userID}";
|
||||
final resp = await get(
|
||||
service: service,
|
||||
);
|
||||
|
||||
print("url list type : $service");
|
||||
|
||||
final result = List<CompanyModel>.empty(growable: true);
|
||||
resp['data'].forEach((e) {
|
||||
final model = CompanyModel.fromJson(e);
|
||||
result.add(model);
|
||||
});
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -100,6 +100,7 @@ class TransaksiRepository extends BaseRepository {
|
||||
'userid': userid,
|
||||
'sender': sender,
|
||||
'companyid': M_CompanyID,
|
||||
'base64File': base64file,
|
||||
'fileName': fileName,
|
||||
'fileSize': fileSize,
|
||||
'fileEkstension': fileExtension
|
||||
@@ -139,7 +140,7 @@ class TransaksiRepository extends BaseRepository {
|
||||
String categoryid,
|
||||
) async {
|
||||
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
|
||||
final resp = await get(
|
||||
// param: {
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:app_petty_cash/model/auth_model.dart';
|
||||
import 'package:app_petty_cash/model/company_model.dart';
|
||||
import 'package:app_petty_cash/screen/change_company/list_company_provider.dart';
|
||||
import 'package:app_petty_cash/widget/sankbar_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import '../../app/constant.dart';
|
||||
import '../../app/route.dart';
|
||||
@@ -12,6 +19,14 @@ class ChangeCompanyScreen extends HookConsumerWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final listCompany = useState<List<CompanyModel>>([
|
||||
CompanyModel(companyid: "1", companyname: "SAS"),
|
||||
CompanyModel(companyid: "2", companyname: "SIM")
|
||||
]);
|
||||
final isLoading = useState(false);
|
||||
final selectedCompanyID = useState("0");
|
||||
final selectedCompanyName = useState("");
|
||||
final auth = ref.watch(currentUserProvider);
|
||||
useEffect(() {
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
|
||||
final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
|
||||
@@ -23,9 +38,29 @@ class ChangeCompanyScreen extends HookConsumerWidget {
|
||||
// Navigator.popAndPushNamed(context, loginRoute);
|
||||
return;
|
||||
}
|
||||
ref.read(ListCompanyProvider.notifier).getListCompany(userID: userID);
|
||||
});
|
||||
return () {};
|
||||
}, []);
|
||||
|
||||
ref.listen(
|
||||
ListCompanyProvider,
|
||||
(previous, next) {
|
||||
if (next is ListCompanyStateLoading) {
|
||||
isLoading.value = true;
|
||||
} else if (next is ListCompanyStateError) {
|
||||
// print(next.message);
|
||||
isLoading.value = false;
|
||||
SanckbarWidget(context, next.message, snackbarType.error);
|
||||
} else if (next is ListCompanyStateDone) {
|
||||
print(jsonEncode(next.model));
|
||||
// print(next.model.length);
|
||||
listCompany.value = next.model;
|
||||
selectedCompanyID.value = auth?.model.M_CompanyID ?? "0";
|
||||
isLoading.value = false;
|
||||
}
|
||||
},
|
||||
);
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: Constant.getActualYPhone(context: context, y: 30),
|
||||
@@ -43,7 +78,131 @@ class ChangeCompanyScreen extends HookConsumerWidget {
|
||||
),
|
||||
),
|
||||
drawer: CustomDrawer(),
|
||||
body: Text('Under Construction'),
|
||||
body: SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(20),
|
||||
child: isLoading.value
|
||||
? Container(
|
||||
height: MediaQuery.of(context).size.height,
|
||||
child: Center(
|
||||
child: CircularProgressIndicator(),
|
||||
),
|
||||
)
|
||||
: Column(
|
||||
children: listCompany.value
|
||||
.map((e) => Container(
|
||||
margin: EdgeInsets.only(bottom: 20),
|
||||
child: InkWell(
|
||||
onTap: () async {
|
||||
selectedCompanyID.value = e.companyid ?? "0";
|
||||
selectedCompanyName.value =
|
||||
e.companyname ?? "0";
|
||||
final shared =
|
||||
await SharedPreferences.getInstance();
|
||||
final oldData = jsonDecode(
|
||||
shared.getString(Constant.bearerName) ??
|
||||
"");
|
||||
print(oldData['token']);
|
||||
|
||||
final newModel = AuthDoctorModel.fromJson(
|
||||
oldData['model']);
|
||||
newModel.M_CompanyID = e.companyid ?? "0";
|
||||
newModel.M_CompanyName = e.companyname ?? "";
|
||||
final token = jsonEncode({
|
||||
"date": oldData['date'],
|
||||
"model": newModel,
|
||||
"token": oldData['token']
|
||||
});
|
||||
final newAuthData = AuthModel(
|
||||
token: oldData['token'], model: newModel);
|
||||
await shared.setString(
|
||||
Constant.bearerName, token);
|
||||
ref.read(currentUserProvider.notifier).state =
|
||||
newAuthData;
|
||||
Navigator.pushNamed(context, homeRoute);
|
||||
},
|
||||
child: Card(
|
||||
shadowColor:
|
||||
selectedCompanyID.value == e.companyid
|
||||
? Constant.bgIconHistory
|
||||
: Colors.white,
|
||||
surfaceTintColor:
|
||||
selectedCompanyID.value == e.companyid
|
||||
? Constant.bgIconHistory
|
||||
: Colors.white,
|
||||
// elevation: selectedCompanyID.value == e.companyid
|
||||
// ? 0
|
||||
// : 1,
|
||||
elevation: 10,
|
||||
color: selectedCompanyID.value == e.companyid
|
||||
? Constant.bgIconHistory
|
||||
: Colors.white,
|
||||
child: Container(
|
||||
padding: EdgeInsets.all(20),
|
||||
width: MediaQuery.of(context).size.width,
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Icon(
|
||||
Icons.corporate_fare,
|
||||
color:
|
||||
selectedCompanyID.value ==
|
||||
e.companyid
|
||||
? Constant.textRed
|
||||
: Colors.black,
|
||||
size: 30,
|
||||
)),
|
||||
SizedBox(
|
||||
width: 10,
|
||||
),
|
||||
Expanded(
|
||||
flex: 8,
|
||||
child: Text(e.companyname ?? "",
|
||||
softWrap: true,
|
||||
maxLines: 3,
|
||||
// overflow: ,
|
||||
style: Constant.body1(
|
||||
context: context)
|
||||
.copyWith(
|
||||
color: selectedCompanyID
|
||||
.value ==
|
||||
e.companyid
|
||||
? Constant.textRed
|
||||
: Colors.black,
|
||||
fontSize: 25)),
|
||||
),
|
||||
],
|
||||
)),
|
||||
),
|
||||
),
|
||||
))
|
||||
.toList()
|
||||
// [
|
||||
// Card(
|
||||
// shadowColor: Colors.white,
|
||||
// // surfaceTintColor: Colors.white,
|
||||
// elevation: 0,
|
||||
// color: Constant.bgIconHistory,
|
||||
// child: Container(
|
||||
// padding: EdgeInsets.all(10),
|
||||
// width: MediaQuery.of(context).size.width,
|
||||
// child: Row(
|
||||
// children: [
|
||||
// Icon(Icons.corporate_fare),
|
||||
// SizedBox(
|
||||
// width: 10,
|
||||
// ),
|
||||
// Text("Company",
|
||||
// style: Constant.body1(context: context)
|
||||
// .copyWith(color: Constant.textRed)),
|
||||
// ],
|
||||
// )),
|
||||
// )
|
||||
// ],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
import 'package:app_petty_cash/model/company_model.dart';
|
||||
import 'package:app_petty_cash/repository/company_repository.dart';
|
||||
|
||||
import '../../model/list_category_model.dart';
|
||||
import '../../repository/transaksi_repository.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
||||
import '../../provider/dio_provider.dart';
|
||||
import '../../repository/base_repository.dart';
|
||||
|
||||
abstract class ListCompanyState extends Equatable {
|
||||
final DateTime date;
|
||||
const ListCompanyState(this.date);
|
||||
@override
|
||||
List<Object?> get props => [date];
|
||||
}
|
||||
|
||||
class ListCompanyStateInit extends ListCompanyState {
|
||||
ListCompanyStateInit() : super(DateTime.now());
|
||||
}
|
||||
|
||||
class ListCompanyStateLoading extends ListCompanyState {
|
||||
ListCompanyStateLoading() : super(DateTime.now());
|
||||
}
|
||||
|
||||
class ListCompanyStateError extends ListCompanyState {
|
||||
final String message;
|
||||
ListCompanyStateError({
|
||||
required this.message,
|
||||
}) : super(DateTime.now());
|
||||
}
|
||||
|
||||
class ListCompanyStateDone extends ListCompanyState {
|
||||
final List<CompanyModel> model;
|
||||
ListCompanyStateDone({
|
||||
required this.model,
|
||||
}) : super(DateTime.now());
|
||||
}
|
||||
|
||||
//notifier
|
||||
class ListCompanyNotifier extends StateNotifier<ListCompanyState> {
|
||||
final Ref ref;
|
||||
ListCompanyNotifier({
|
||||
required this.ref,
|
||||
}) : super(ListCompanyStateInit());
|
||||
|
||||
void getListCompany({required String userID}) async {
|
||||
try {
|
||||
state = ListCompanyStateLoading();
|
||||
final dio = ref.read(dioProvider);
|
||||
final resp =
|
||||
await CompanyRepository(dio: dio).getListCompany(userID: userID);
|
||||
state = ListCompanyStateDone(model: resp);
|
||||
} catch (e) {
|
||||
if (e is BaseRepositoryException) {
|
||||
state = ListCompanyStateError(message: e.message.toString());
|
||||
} else {
|
||||
state = ListCompanyStateError(message: e.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//provider
|
||||
final ListCompanyProvider =
|
||||
StateNotifierProvider<ListCompanyNotifier, ListCompanyState>(
|
||||
(ref) => ListCompanyNotifier(ref: ref),
|
||||
);
|
||||
@@ -0,0 +1,83 @@
|
||||
import 'package:app_petty_cash/model/auth_model.dart';
|
||||
import 'package:app_petty_cash/model/company_model.dart';
|
||||
import 'package:app_petty_cash/repository/auth_repository.dart';
|
||||
import 'package:app_petty_cash/repository/company_repository.dart';
|
||||
|
||||
import '../../model/list_category_model.dart';
|
||||
import '../../repository/transaksi_repository.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
||||
import '../../provider/dio_provider.dart';
|
||||
import '../../repository/base_repository.dart';
|
||||
|
||||
abstract class ChangePasswordState extends Equatable {
|
||||
final DateTime date;
|
||||
const ChangePasswordState(this.date);
|
||||
@override
|
||||
List<Object?> get props => [date];
|
||||
}
|
||||
|
||||
class ChangePasswordStateInit extends ChangePasswordState {
|
||||
ChangePasswordStateInit() : super(DateTime.now());
|
||||
}
|
||||
|
||||
class ChangePasswordStateLoading extends ChangePasswordState {
|
||||
ChangePasswordStateLoading() : super(DateTime.now());
|
||||
}
|
||||
|
||||
class ChangePasswordStateError extends ChangePasswordState {
|
||||
final String message;
|
||||
ChangePasswordStateError({
|
||||
required this.message,
|
||||
}) : super(DateTime.now());
|
||||
}
|
||||
|
||||
class ChangePasswordStateDone extends ChangePasswordState {
|
||||
final String model;
|
||||
ChangePasswordStateDone({
|
||||
required this.model,
|
||||
}) : super(DateTime.now());
|
||||
}
|
||||
|
||||
//notifier
|
||||
class ChangePasswordNotifier extends StateNotifier<ChangePasswordState> {
|
||||
final Ref ref;
|
||||
ChangePasswordNotifier({
|
||||
required this.ref,
|
||||
}) : super(ChangePasswordStateInit());
|
||||
|
||||
void postChangePassword({
|
||||
required String userID,
|
||||
required String userToken,
|
||||
required String userTokenx,
|
||||
required String oldPassword,
|
||||
required String newPassword,
|
||||
required String confirmPassword,
|
||||
}) async {
|
||||
try {
|
||||
state = ChangePasswordStateLoading();
|
||||
final dio = ref.read(dioProvider);
|
||||
final resp = await AuthRepository(dio: dio).changePassword(
|
||||
userID: userID,
|
||||
tokenx: userTokenx,
|
||||
token: userToken,
|
||||
oldPassword: oldPassword,
|
||||
newPassword: newPassword,
|
||||
confirmPassword: confirmPassword);
|
||||
state = ChangePasswordStateDone(model: resp);
|
||||
} catch (e) {
|
||||
if (e is BaseRepositoryException) {
|
||||
state = ChangePasswordStateError(message: e.message.toString());
|
||||
} else {
|
||||
state = ChangePasswordStateError(message: e.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//provider
|
||||
final ChangePasswordProvider =
|
||||
StateNotifierProvider<ChangePasswordNotifier, ChangePasswordState>(
|
||||
(ref) => ChangePasswordNotifier(ref: ref),
|
||||
);
|
||||
@@ -0,0 +1,426 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:app_petty_cash/app/constant.dart';
|
||||
import 'package:app_petty_cash/provider/current_menu_provider.dart';
|
||||
import 'package:app_petty_cash/screen/change_pasword/change_password_provider.dart';
|
||||
import 'package:app_petty_cash/screen/login/logout_provider.dart';
|
||||
import 'package:app_petty_cash/widget/custom_drawer.dart';
|
||||
import 'package:app_petty_cash/widget/sankbar_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import '../../app/route.dart';
|
||||
import '../../provider/current_user_provider.dart';
|
||||
|
||||
class ChangePasswordScreen extends HookConsumerWidget {
|
||||
const ChangePasswordScreen({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final selectedUser = ref.read(currentUserProvider);
|
||||
//menampung user token jika ada
|
||||
final userToken = ref.read(currentUserProvider)?.token ?? "";
|
||||
final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0";
|
||||
final tokenx = ref.read(currentUserProvider)?.token ?? "";
|
||||
|
||||
final isLoading = useState(false);
|
||||
final obscureText = useState<bool>(true);
|
||||
final ctrlOldPassword = useTextEditingController(text: "");
|
||||
final ctrlNewPassword = useTextEditingController(text: "");
|
||||
final ctrlConfirmPassword = useTextEditingController(text: "");
|
||||
final loading = useState(false);
|
||||
|
||||
// inisialisasi agar bisa cek apakah user sudah login sukses apa belum
|
||||
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 () {};
|
||||
}, []);
|
||||
Logout() async {
|
||||
final shared = await SharedPreferences.getInstance();
|
||||
final bearerString = shared.get(Constant.bearerName).toString();
|
||||
// print(bearerString);
|
||||
if (bearerString.isNotEmpty) {
|
||||
shared.remove(bearerString);
|
||||
shared.clear();
|
||||
// Navigator.popAndPushNamed(context, loginRoute);
|
||||
ref.read(currentUserProvider.notifier).state = null;
|
||||
Navigator.of(context)
|
||||
.pushNamedAndRemoveUntil(loginRoute, (route) => false);
|
||||
}
|
||||
}
|
||||
|
||||
// read provider home
|
||||
ref.listen(
|
||||
ChangePasswordProvider,
|
||||
(previous, next) {
|
||||
if (next is ChangePasswordStateLoading) {
|
||||
loading.value = true;
|
||||
} else if (next is ChangePasswordStateError) {
|
||||
loading.value = false;
|
||||
SanckbarWidget(context, next.message, snackbarType.error);
|
||||
} else if (next is ChangePasswordStateDone) {
|
||||
loading.value = false;
|
||||
SanckbarWidget(
|
||||
context,
|
||||
"Ubah Password Berhasil!\nSilahkan Login dengan password baru",
|
||||
snackbarType.success,
|
||||
);
|
||||
Logout();
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: Constant.getActualYPhone(context: context, y: 30)),
|
||||
child: Scaffold(
|
||||
appBar: AppBar(
|
||||
// centerTitle: true,
|
||||
title: Text(
|
||||
'Change Password',
|
||||
style: TextStyle(color: Constant.textWhite),
|
||||
),
|
||||
backgroundColor: Constant.pcBtnBackgroundColor,
|
||||
iconTheme: IconThemeData(
|
||||
color: Constant.textWhite,
|
||||
),
|
||||
),
|
||||
drawer: CustomDrawer(),
|
||||
body: SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(20),
|
||||
child: Container(
|
||||
width: Constant.getActualXPhone(context: context, x: 390),
|
||||
height: Constant.getActualYPhone(context: context, y: 844),
|
||||
child: Column(
|
||||
children: [
|
||||
//Old password
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
// top: Constant.getActualYPhone(context: context, y: 63),
|
||||
left: Constant.getActualXPhone(context: context, x: 20),
|
||||
right: Constant.getActualXPhone(context: context, x: 20),
|
||||
),
|
||||
child: Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
'Old Password',
|
||||
style: Constant.body1_400_dibulan(context: context)
|
||||
.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Constant.textBlack),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: Constant.getActualYPhone(context: context, y: 4),
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: Constant.getActualYPhone(context: context, y: 5),
|
||||
left: Constant.getActualXPhone(context: context, x: 20),
|
||||
right: Constant.getActualXPhone(context: context, x: 20),
|
||||
),
|
||||
child: TextField(
|
||||
obscureText: obscureText.value,
|
||||
controller: ctrlOldPassword,
|
||||
decoration: InputDecoration(
|
||||
suffixIcon: IconButton(
|
||||
icon: Icon(
|
||||
obscureText.value
|
||||
? Icons.visibility
|
||||
: Icons.visibility_off,
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
onPressed: () {
|
||||
obscureText.value = !obscureText.value;
|
||||
},
|
||||
),
|
||||
hintStyle:
|
||||
Constant.body2_400(context: context).copyWith(
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
labelStyle:
|
||||
Constant.body2_400(context: context).copyWith(
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
border: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
color: Colors.orange,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
color: Constant.textGreyv2,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
labelText: "OldPassword",
|
||||
hintText: 'Old Password',
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: Constant.getActualYPhone(context: context, y: 40),
|
||||
),
|
||||
//New password
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
// top: Constant.getActualYPhone(context: context, y: 63),
|
||||
left: Constant.getActualXPhone(context: context, x: 20),
|
||||
right: Constant.getActualXPhone(context: context, x: 20),
|
||||
),
|
||||
child: Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
'New Password',
|
||||
style: Constant.body1_400_dibulan(context: context)
|
||||
.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Constant.textBlack),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: Constant.getActualYPhone(context: context, y: 4),
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: Constant.getActualYPhone(context: context, y: 5),
|
||||
left: Constant.getActualXPhone(context: context, x: 20),
|
||||
right: Constant.getActualXPhone(context: context, x: 20),
|
||||
),
|
||||
child: TextField(
|
||||
obscureText: obscureText.value,
|
||||
controller: ctrlNewPassword,
|
||||
decoration: InputDecoration(
|
||||
suffixIcon: IconButton(
|
||||
icon: Icon(
|
||||
obscureText.value
|
||||
? Icons.visibility
|
||||
: Icons.visibility_off,
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
onPressed: () {
|
||||
obscureText.value = !obscureText.value;
|
||||
},
|
||||
),
|
||||
hintStyle:
|
||||
Constant.body2_400(context: context).copyWith(
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
labelStyle:
|
||||
Constant.body2_400(context: context).copyWith(
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
border: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
color: Colors.orange,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
color: Constant.textGreyv2,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
labelText: "New Password",
|
||||
hintText: 'New Password',
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
SizedBox(
|
||||
height: Constant.getActualYPhone(context: context, y: 40),
|
||||
),
|
||||
|
||||
// Confirm password
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
// top: Constant.getActualYPhone(context: context, y: 63),
|
||||
left: Constant.getActualXPhone(context: context, x: 20),
|
||||
right: Constant.getActualXPhone(context: context, x: 20),
|
||||
),
|
||||
child: Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
'Confirm Password',
|
||||
style: Constant.body1_400_dibulan(context: context)
|
||||
.copyWith(
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Constant.textBlack),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: Constant.getActualYPhone(context: context, y: 4),
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
top: Constant.getActualYPhone(context: context, y: 5),
|
||||
left: Constant.getActualXPhone(context: context, x: 20),
|
||||
right: Constant.getActualXPhone(context: context, x: 20),
|
||||
),
|
||||
child: TextField(
|
||||
obscureText: obscureText.value,
|
||||
controller: ctrlConfirmPassword,
|
||||
decoration: InputDecoration(
|
||||
suffixIcon: IconButton(
|
||||
icon: Icon(
|
||||
obscureText.value
|
||||
? Icons.visibility
|
||||
: Icons.visibility_off,
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
onPressed: () {
|
||||
obscureText.value = !obscureText.value;
|
||||
},
|
||||
),
|
||||
hintStyle:
|
||||
Constant.body2_400(context: context).copyWith(
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
labelStyle:
|
||||
Constant.body2_400(context: context).copyWith(
|
||||
color: Constant.textGreyv2,
|
||||
),
|
||||
border: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
color: Colors.orange,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
color: Constant.textGreyv2,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
labelText: "Confirm Password",
|
||||
hintText: 'Confirm Password',
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: Constant.getActualYPhone(context: context, y: 50),
|
||||
),
|
||||
|
||||
//Button Update Password
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
left: Constant.getActualXPhone(context: context, x: 20),
|
||||
right: Constant.getActualXPhone(context: context, x: 20),
|
||||
),
|
||||
child: SizedBox(
|
||||
width: Constant.getActualXPhone(context: context, x: 390),
|
||||
height: Constant.getActualYPhone(context: context, y: 50),
|
||||
child: ElevatedButton(
|
||||
onPressed: (loading.value == true)
|
||||
? null
|
||||
: () {
|
||||
if (ctrlNewPassword.text !=
|
||||
ctrlConfirmPassword.text) {
|
||||
SanckbarWidget(
|
||||
context,
|
||||
'New Password dan dan confirm password tidak sama!',
|
||||
snackbarType.warning);
|
||||
return;
|
||||
}
|
||||
if (ctrlOldPassword.text ==
|
||||
ctrlConfirmPassword.text) {
|
||||
SanckbarWidget(
|
||||
context,
|
||||
'Password lama dan baru tidak boleh sama',
|
||||
snackbarType.warning);
|
||||
return;
|
||||
}
|
||||
if (ctrlOldPassword.text.isEmpty ||
|
||||
ctrlNewPassword.text.isEmpty ||
|
||||
ctrlConfirmPassword.text.isEmpty) {
|
||||
isLoading.value = true;
|
||||
SanckbarWidget(context, 'Inputan harus diisi',
|
||||
snackbarType.warning);
|
||||
} else {
|
||||
ref
|
||||
.read(ChangePasswordProvider.notifier)
|
||||
.postChangePassword(
|
||||
userTokenx: tokenx,
|
||||
userToken: userToken,
|
||||
userID: userID,
|
||||
oldPassword: ctrlOldPassword.text,
|
||||
newPassword: ctrlNewPassword.text,
|
||||
confirmPassword:
|
||||
ctrlConfirmPassword.text,
|
||||
);
|
||||
}
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor: MaterialStateColor.resolveWith(
|
||||
(st) => (loading.value == true)
|
||||
? Constant.textGrey
|
||||
: 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: [
|
||||
(isLoading.value)
|
||||
? SizedBox(
|
||||
width: Constant.getActualXPhone(
|
||||
context: context, x: 24),
|
||||
height: Constant.getActualYPhone(
|
||||
context: context, y: 32),
|
||||
child: Center(
|
||||
child: CircularProgressIndicator(
|
||||
color: Colors.white,
|
||||
),
|
||||
),
|
||||
)
|
||||
: Align(
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
'Submit',
|
||||
style: Constant.titleH3_700(
|
||||
context: context)
|
||||
.copyWith(
|
||||
color: Constant.textLoginColor),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import 'package:app_petty_cash/screen/home/list_transaksi_home_provider.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:shared_preferences/shared_preferences.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(
|
||||
padding: EdgeInsets.only(
|
||||
top: Constant.getActualYPhone(context: context, y: 30),
|
||||
@@ -400,6 +420,85 @@ class HomeScreen extends HookConsumerWidget {
|
||||
.value[idx].tipe
|
||||
.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 and by 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,
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
child: Text(
|
||||
' by : ' +
|
||||
listTransaksiHome
|
||||
.value[idx]
|
||||
.usertransaksi
|
||||
.toString(),
|
||||
overflow:
|
||||
TextOverflow.ellipsis,
|
||||
style: Constant.body1(
|
||||
context: context)
|
||||
.copyWith(
|
||||
fontWeight:
|
||||
FontWeight.normal,
|
||||
fontStyle:
|
||||
FontStyle.italic,
|
||||
color: Constant
|
||||
.pcBtnBackgroundColor,
|
||||
fontSize: 14,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -31,6 +31,10 @@ class ReportScreen extends HookConsumerWidget {
|
||||
final tglAkhirTmp = useState<String>("");
|
||||
String M_CompanyID = "0";
|
||||
|
||||
String timeStamp = DateFormat('dd-MM-yyyy').format(
|
||||
DateTime.now(),
|
||||
);
|
||||
|
||||
Future<String> getCompanyID() async {
|
||||
final shared = await SharedPreferences.getInstance();
|
||||
String M_CompanyID = "0";
|
||||
@@ -328,8 +332,9 @@ class ReportScreen extends HookConsumerWidget {
|
||||
),
|
||||
onPressed: () async {
|
||||
M_CompanyID = await getCompanyID();
|
||||
if(M_CompanyID == "0"){
|
||||
SanckbarWidget(context, 'Invalid Company', snackbarType.error);
|
||||
if (M_CompanyID == "0") {
|
||||
SanckbarWidget(
|
||||
context, 'Invalid Company', snackbarType.error);
|
||||
return;
|
||||
}
|
||||
// Awal
|
||||
@@ -343,13 +348,13 @@ class ReportScreen extends HookConsumerWidget {
|
||||
// Akhir
|
||||
DateTime parsedDateAkhir =
|
||||
DateFormat('dd-MM-yyyy').parse(
|
||||
ctrlTglAwal.value.text.toString(),
|
||||
ctrlTglAkhir.value.text.toString(),
|
||||
);
|
||||
String formattedDateAkhir =
|
||||
DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
|
||||
|
||||
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))) {
|
||||
// throw Exception('Could not launch $url');
|
||||
SanckbarWidget(context, 'Could not launch $url',
|
||||
@@ -406,8 +411,9 @@ class ReportScreen extends HookConsumerWidget {
|
||||
),
|
||||
onPressed: () async {
|
||||
M_CompanyID = await getCompanyID();
|
||||
if(M_CompanyID == "0"){
|
||||
SanckbarWidget(context, 'Invalid Company', snackbarType.error);
|
||||
if (M_CompanyID == "0") {
|
||||
SanckbarWidget(
|
||||
context, 'Invalid Company', snackbarType.error);
|
||||
return;
|
||||
}
|
||||
// Awal
|
||||
@@ -421,13 +427,15 @@ class ReportScreen extends HookConsumerWidget {
|
||||
// Akhir
|
||||
DateTime parsedDateAkhir =
|
||||
DateFormat('dd-MM-yyyy').parse(
|
||||
ctrlTglAwal.value.text.toString(),
|
||||
ctrlTglAkhir.value.text.toString(),
|
||||
);
|
||||
String formattedDateAkhir =
|
||||
DateFormat('yyyy-MM-dd').format(parsedDateAkhir);
|
||||
|
||||
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))) {
|
||||
// throw Exception('Could not launch $url');
|
||||
SanckbarWidget(context, 'Could not launch $url',
|
||||
|
||||
@@ -464,6 +464,25 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
||||
final FocusNode focusNodetglAkhir = useFocusNode();
|
||||
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(
|
||||
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
|
||||
child: Padding(
|
||||
@@ -736,6 +755,7 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
||||
value: option,
|
||||
child: Text(
|
||||
option.categoryname ?? "",
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Constant.body1(context: context)
|
||||
.copyWith(
|
||||
color: Constant.textBlack,
|
||||
@@ -875,13 +895,27 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
||||
],
|
||||
),
|
||||
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();
|
||||
ref
|
||||
.read(searchHistoryTransaksiProvider.notifier)
|
||||
.searchHistoryTransaksi(
|
||||
M_CompanyID.value,
|
||||
ctrlTglAwal.text,
|
||||
ctrlTglAkhir.text,
|
||||
formattedDateAwal,
|
||||
formattedDateAkhir,
|
||||
selectedListCategory.value.categoryid ?? "0",
|
||||
);
|
||||
},
|
||||
@@ -1080,7 +1114,27 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
||||
// ),
|
||||
SizedBox(
|
||||
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
|
||||
@@ -1308,70 +1362,70 @@ class HistoryTransaksiScreen extends HookConsumerWidget {
|
||||
),
|
||||
],
|
||||
),
|
||||
// Row(
|
||||
// children: [
|
||||
// Container(
|
||||
// width: Constant.getActualXPhone(
|
||||
// context: context, x: 40),
|
||||
// height: Constant.getActualYPhone(
|
||||
// context: context,
|
||||
// y: 40,
|
||||
// ),
|
||||
// child: Image.asset(
|
||||
// "images/icon_delete.png",
|
||||
// // scale: 1,
|
||||
// ),
|
||||
// ),
|
||||
// SizedBox(
|
||||
// height: Constant.getActualYPhone(
|
||||
// context: context, y: 12),
|
||||
// ),
|
||||
// Expanded(
|
||||
// child: ElevatedButton(
|
||||
// style: ButtonStyle(
|
||||
// backgroundColor: MaterialStateColor
|
||||
// .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: () {},
|
||||
// ),
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
// Tanggal Created dan by align right
|
||||
|
||||
Column(
|
||||
children: [
|
||||
Align(
|
||||
alignment:
|
||||
Alignment.centerRight,
|
||||
child: Row(
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.end,
|
||||
children: [
|
||||
Text(
|
||||
'created : ' +
|
||||
formatDateString(
|
||||
listSearchHistory
|
||||
.value[idx]
|
||||
.tanggalcreated
|
||||
.toString(),
|
||||
),
|
||||
overflow:
|
||||
TextOverflow.ellipsis,
|
||||
style: Constant.body1(
|
||||
context: context)
|
||||
.copyWith(
|
||||
fontWeight:
|
||||
FontWeight.normal,
|
||||
fontStyle:
|
||||
FontStyle.italic,
|
||||
color:
|
||||
Constant.textBlack,
|
||||
fontSize: 14,
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
child: Text(
|
||||
' by : ' +
|
||||
listSearchHistory
|
||||
.value[idx]
|
||||
.usertransaksi
|
||||
.toString(),
|
||||
overflow: TextOverflow
|
||||
.ellipsis,
|
||||
style: Constant.body1(
|
||||
context:
|
||||
context)
|
||||
.copyWith(
|
||||
fontWeight:
|
||||
FontWeight
|
||||
.normal,
|
||||
fontStyle: FontStyle
|
||||
.italic,
|
||||
color: Constant
|
||||
.pcBtnBackgroundColor,
|
||||
fontSize: 14,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -39,6 +39,7 @@ class TransaksiSelectKategoriWidget extends StatelessWidget {
|
||||
value: option,
|
||||
child: Text(
|
||||
option.categoryname ?? "",
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Constant.body1(context: context).copyWith(
|
||||
color: Constant.textBlack, fontWeight: FontWeight.w400),
|
||||
),
|
||||
|
||||
@@ -250,6 +250,50 @@ class CustomDrawer extends HookConsumerWidget {
|
||||
ref.read(currentPageProvider.state).update((state) => 3);
|
||||
Navigator.pushNamed(context, reportRoute);
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: Icon(
|
||||
Icons.account_balance,
|
||||
color: (currentMenu == 4)
|
||||
? Constant.pcBtnBackgroundColor
|
||||
: Constant.textGreyv2,
|
||||
),
|
||||
title: Text(
|
||||
'Change Company',
|
||||
style: TextStyle(
|
||||
color: (currentMenu == 4)
|
||||
? Constant.pcBtnBackgroundColor
|
||||
: Constant.textGreyv2,
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
// Handle navigation to Transaksi screen
|
||||
Navigator.pop(context);
|
||||
ref.read(currentPageProvider.state).update((state) => 4);
|
||||
Navigator.pushNamed(context, changeCompanyRoute);
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: Icon(
|
||||
Icons.lock_reset,
|
||||
color: (currentMenu == 5)
|
||||
? Constant.pcBtnBackgroundColor
|
||||
: Constant.textGreyv2,
|
||||
),
|
||||
title: Text(
|
||||
'Change Password',
|
||||
style: TextStyle(
|
||||
color: (currentMenu == 5)
|
||||
? Constant.pcBtnBackgroundColor
|
||||
: Constant.textGreyv2,
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
// Handle navigation to Transaksi screen
|
||||
Navigator.pop(context);
|
||||
ref.read(currentPageProvider.state).update((state) => 5);
|
||||
Navigator.pushNamed(context, changePasswordRoute);
|
||||
},
|
||||
),
|
||||
ListTile(
|
||||
leading: Icon(
|
||||
|
||||
@@ -211,71 +211,6 @@ class HistoryRowAtasWidget extends HookConsumerWidget {
|
||||
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),
|
||||
),
|
||||
|
||||
|
||||
@@ -85,10 +85,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:
|
||||
@@ -278,6 +278,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.0.4"
|
||||
flutter_share:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_share
|
||||
sha256: ae12c1cea13b35926a109824ffac601531e40cb94ad53eeae58625eceb3eaaaa
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.0"
|
||||
flutter_svg:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -436,26 +444,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"
|
||||
mime:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
@@ -689,18 +697,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:
|
||||
@@ -713,10 +721,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:
|
||||
@@ -737,10 +745,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:
|
||||
@@ -893,6 +901,22 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.17"
|
||||
web:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: web
|
||||
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.3.0"
|
||||
whatsapp_share:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: whatsapp_share
|
||||
sha256: d1884f302a52d9f400bc3d7d4274b77aad83424e08f425351cea8d13b4cb8649
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.0.2"
|
||||
win32:
|
||||
dependency: transitive
|
||||
description:
|
||||
@@ -926,5 +950,5 @@ packages:
|
||||
source: hosted
|
||||
version: "3.1.2"
|
||||
sdks:
|
||||
dart: ">=3.0.6 <4.0.0"
|
||||
dart: ">=3.2.0-194.0.dev <4.0.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
|
||||
# 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.
|
||||
version: 1.0.0+1
|
||||
version: 1.1.5
|
||||
|
||||
environment:
|
||||
sdk: '>=3.0.6 <4.0.0'
|
||||
@@ -58,6 +58,8 @@ dependencies:
|
||||
photo_view: ^0.14.0
|
||||
mime: ^1.0.4
|
||||
path_provider: ^2.1.2
|
||||
flutter_share: ^2.0.0
|
||||
whatsapp_share: ^2.0.2
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
||||
Reference in New Issue
Block a user